diff --git a/DependencyInjection/ChillEventExtension.php b/DependencyInjection/ChillEventExtension.php
index 977a9d9dd..639d3068d 100644
--- a/DependencyInjection/ChillEventExtension.php
+++ b/DependencyInjection/ChillEventExtension.php
@@ -24,16 +24,16 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-        $loader->load('services/authorization.yml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/fixtures.yml');
-        $loader->load('services/forms.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/repositories.yml');
-        $loader->load('services/search.yml');
-        $loader->load('services/timeline.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/authorization.yaml');
+        $loader->load('services/controller.yaml');
+        $loader->load('services/fixtures.yaml');
+        $loader->load('services/forms.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/repositories.yaml');
+        $loader->load('services/search.yaml');
+        $loader->load('services/timeline.yaml');
     }
     
      /* (non-PHPdoc)
@@ -56,7 +56,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillEventBundle/Resources/config/routing.yml'
+                 '@ChillEventBundle/config/routes.yaml'
               )
            )
         ));
diff --git a/Resources/config/routing.yml b/config/routes.yaml
similarity index 58%
rename from Resources/config/routing.yml
rename to config/routes.yaml
index e4e36b796..65ae15ed0 100644
--- a/Resources/config/routing.yml
+++ b/config/routes.yaml
@@ -1,9 +1,9 @@
 chill_event_event:
-    resource: "@ChillEventBundle/Resources/config/routing/event.yml"
+    resource: "@ChillEventBundle/config/routes/event.yaml"
     prefix:    /{_locale}/event/event
 
 chill_event_participation:
-    resource: "@ChillEventBundle/Resources/config/routing/participation.yml"
+    resource: "@ChillEventBundle/config/routes/participation.yaml"
     prefix:   /{_locale}/event/participation
 
 
@@ -11,7 +11,7 @@ chill_event_participation:
 
 chill_event_admin:
     path:     /{_locale}/admin/event
-    defaults: { _controller: "ChillEventBundle:Admin:index" }
+    controller: Chill\EventBundle\Controller\AdminController::indexAction
     options:
         menus:
             admin_section:
@@ -20,14 +20,14 @@ chill_event_admin:
                 icons: ['calendar']
 
 chill_event_admin_status:
-    resource: "@ChillEventBundle/Resources/config/routing/status.yml"
+    resource: "@ChillEventBundle/config/routes/status.yaml"
     prefix:   /{_locale}/admin/event/status
 
 chill_event_admin_role:
-    resource: "@ChillEventBundle/Resources/config/routing/role.yml"
+    resource: "@ChillEventBundle/config/routes/role.yaml"
     prefix:   /{_locale}/admin/event/role
 
 chill_event_admin_event_type:
-    resource: "@ChillEventBundle/Resources/config/routing/eventtype.yml"
+    resource: "@ChillEventBundle/config/routes/eventtype.yaml"
     prefix:   /{_locale}/admin/event/event_type
     
diff --git a/Resources/config/routing/event.yml b/config/routes/event.yaml
similarity index 59%
rename from Resources/config/routing/event.yml
rename to config/routes/event.yaml
index 83bedcd9e..99dd6447c 100644
--- a/Resources/config/routing/event.yml
+++ b/config/routes/event.yaml
@@ -1,6 +1,6 @@
 chill_event_list_most_recent:
     path:    most_recent
-    defaults: { _controller: "ChillEventBundle:Event:mostRecentIndex" }
+    controller: Chill\EventBundle\Controller\EventController::mostRecentIndexAction
     options:
         menus:
             section:
@@ -10,11 +10,11 @@ chill_event_list_most_recent:
 
 chill_event__event_show:
     path:     /{event_id}/show
-    defaults: { _controller: "ChillEventBundle:Event:show" }
+    controller: Chill\EventBundle\Controller\EventController::showAction
 
 chill_event__event_new_pickcenter:
     path:     /new/pick-center
-    defaults: { _controller: "ChillEventBundle:Event:newPickCenter" }
+    controller: Chill\EventBundle\Controller\EventController::newPickCenterAction
     options:
         menus:
             section:
@@ -24,26 +24,26 @@ chill_event__event_new_pickcenter:
 
 chill_event__event_new:
     path:     /new
-    defaults: { _controller: "ChillEventBundle:Event:new" }
+    controller: Chill\EventBundle\Controller\EventController::newAction
     methods:  [ GET, POST ]
 
 chill_event__event_edit:
     path:     /{event_id}/edit
-    defaults: { _controller: "ChillEventBundle:Event:edit" }
+    controller: Chill\EventBundle\Controller\EventController::editAction
 
 chill_event__event_update:
     path:     /{event_id}/update
-    defaults: { _controller: "ChillEventBundle:Event:update" }
+    controller: Chill\EventBundle\Controller\EventController::updateAction
     methods:  [POST, PUT]
 
 chill_event__list_by_person:
     path:     /{person_id}/list
-    defaults: { _controller: "ChillEventBundle:Event:listByPerson" }
+    controller: Chill\EventBundle\Controller\EventController::listByPersonAction
     methods: [ GET ]
 
 chill_event__event_delete:
     path:   /{event_id}/delete
     requirements:
         event_id: \d+
-    defaults: { _controller: "ChillEventBundle:Event:delete" }
+    controller: Chill\EventBundle\Controller\EventController::deleteAction
     methods: [ GET, DELETE ]
\ No newline at end of file
diff --git a/Resources/config/routing/eventtype.yml b/config/routes/eventtype.yaml
similarity index 50%
rename from Resources/config/routing/eventtype.yml
rename to config/routes/eventtype.yaml
index 198a17ebc..cbde13ce6 100644
--- a/Resources/config/routing/eventtype.yml
+++ b/config/routes/eventtype.yaml
@@ -1,6 +1,6 @@
 chill_eventtype_admin:
     path:     /
-    defaults: { _controller: "ChillEventBundle:EventType:index" }
+    controller: Chill\EventBundle\Controller\EventTypeController::indexAction
     options:
         menus:
             admin_events:
@@ -9,27 +9,27 @@ chill_eventtype_admin:
 
 chill_eventtype_admin_show:
     path:     /{id}/show
-    defaults: { _controller: "ChillEventBundle:EventType:show" }
+    controller: Chill\EventBundle\Controller\EventTypeController::showAction
 
 chill_eventtype_admin_new:
     path:     /new
-    defaults: { _controller: "ChillEventBundle:EventType:new" }
+    controller: Chill\EventBundle\Controller\EventTypeController::newAction
 
 chill_eventtype_admin_create:
     path:     /create
-    defaults: { _controller: "ChillEventBundle:EventType:create" }
+    controller: Chill\EventBundle\Controller\EventTypeController::createAction
     methods:  POST
 
 chill_eventtype_admin_edit:
     path:     /{id}/edit
-    defaults: { _controller: "ChillEventBundle:EventType:edit" }
+    controller: Chill\EventBundle\Controller\EventTypeController::editAction
 
 chill_eventtype_admin_update:
     path:     /{id}/update
-    defaults: { _controller: "ChillEventBundle:EventType:update" }
+    controller: Chill\EventBundle\Controller\EventTypeController::updateAction
     methods:  [POST, PUT]
 
 chill_eventtype_admin_delete:
     path:     /{id}/delete
-    defaults: { _controller: "ChillEventBundle:EventType:delete" }
+    controller: Chill\EventBundle\Controller\EventTypeController::deleteAction
     methods:  [POST, DELETE]
diff --git a/Resources/config/routing/participation.yml b/config/routes/participation.yaml
similarity index 50%
rename from Resources/config/routing/participation.yml
rename to config/routes/participation.yaml
index 7d4efc90a..eb11c72a9 100644
--- a/Resources/config/routing/participation.yml
+++ b/config/routes/participation.yaml
@@ -1,33 +1,33 @@
 chill_event_participation_new:
     path: /new
-    defaults: { _controller: ChillEventBundle:Participation:new }
+    controller: Chill\EventBundle\Controller\ParticipationController::newAction
     
 chill_event_participation_create:
     path: /create
-    defaults: { _controller: ChillEventBundle:Participation:create }
+    controller: Chill\EventBundle\Controller\ParticipationController::createAction
     
 chill_event_participation_edit:
     path: /{participation_id}/edit
-    defaults: { _controller: ChillEventBundle:Participation:edit }
+    controller: Chill\EventBundle\Controller\ParticipationController::editAction
     
 chill_event_participation_update:
     path: /{participation_id}/update
-    defaults: { _controller: ChillEventBundle:Participation:update }
+    controller: Chill\EventBundle\Controller\ParticipationController::updateAction
     methods: [POST]
     
 chill_event_participation_edit_multiple:
     path: /{event_id}/edit_multiple
-    defaults: { _controller: ChillEventBundle:Participation:editMultiple }
+    controller: Chill\EventBundle\Controller\ParticipationController::editMultipleAction
     
 chill_event_participation_update_multiple:
     path: /{event_id}/update_multiple
-    defaults: { _controller: ChillEventBundle:Participation:updateMultiple }
+    controller: Chill\EventBundle\Controller\ParticipationController::updateMultipleAction
     methods: [POST]
 
 chill_event_participation_delete:
     path:     /{participation_id}/delete
     requirements:
         participation_id:  \d+
-    defaults: { _controller: ChillEventBundle:Participation:delete }
+    controller: Chill\EventBundle\Controller\ParticipationController::deleteAction
     methods: [ GET, DELETE ]
 
diff --git a/Resources/config/routing/role.yml b/config/routes/role.yaml
similarity index 52%
rename from Resources/config/routing/role.yml
rename to config/routes/role.yaml
index 52746b104..5da3c9f98 100644
--- a/Resources/config/routing/role.yml
+++ b/config/routes/role.yaml
@@ -1,6 +1,6 @@
 chill_event_admin_role:
     path:     /
-    defaults: { _controller: "ChillEventBundle:Role:index" }
+    controller: Chill\EventBundle\Controller\RoleController::indexAction
     options:
         menus:
             admin_events:
@@ -9,27 +9,27 @@ chill_event_admin_role:
 
 chill_event_admin_role_show:
     path:     /{id}/show
-    defaults: { _controller: "ChillEventBundle:Role:show" }
+    controller: Chill\EventBundle\Controller\RoleController::showAction
 
 chill_event_admin_role_new:
     path:     /new
-    defaults: { _controller: "ChillEventBundle:Role:new" }
+    controller: Chill\EventBundle\Controller\RoleController::newAction
 
 chill_event_admin_role_create:
     path:     /create
-    defaults: { _controller: "ChillEventBundle:Role:create" }
+    controller: Chill\EventBundle\Controller\RoleController::createAction
     methods:  POST
 
 chill_event_admin_role_edit:
     path:     /{id}/edit
-    defaults: { _controller: "ChillEventBundle:Role:edit" }
+    controller: Chill\EventBundle\Controller\RoleController::editAction
 
 chill_event_admin_role_update:
     path:     /{id}/update
-    defaults: { _controller: "ChillEventBundle:Role:update" }
+    controller: Chill\EventBundle\Controller\RoleController::updateAction
     methods:  [POST, PUT]
 
 chill_event_admin_role_delete:
     path:     /{id}/delete
-    defaults: { _controller: "ChillEventBundle:Role:delete" }
+    controller: Chill\EventBundle\Controller\RoleController::deleteAction
     methods:  [POST, DELETE]
diff --git a/Resources/config/routing/status.yml b/config/routes/status.yaml
similarity index 52%
rename from Resources/config/routing/status.yml
rename to config/routes/status.yaml
index de6c3dbe0..200d79733 100644
--- a/Resources/config/routing/status.yml
+++ b/config/routes/status.yaml
@@ -1,6 +1,6 @@
 chill_event_admin_status:
     path:     /
-    defaults: { _controller: "ChillEventBundle:Status:index" }
+    controller: Chill\EventBundle\Controller\StatusController::indexAction
     options:
         menus:
             admin_events:
@@ -9,27 +9,27 @@ chill_event_admin_status:
 
 chill_event_admin_status_show:
     path:     /{id}/show
-    defaults: { _controller: "ChillEventBundle:Status:show" }
+    controller: Chill\EventBundle\Controller\StatusController::showAction
 
 chill_event_admin_status_new:
     path:     /new
-    defaults: { _controller: "ChillEventBundle:Status:new" }
+    controller: Chill\EventBundle\Controller\StatusController::newAction
 
 chill_event_admin_status_create:
     path:     /create
-    defaults: { _controller: "ChillEventBundle:Status:create" }
+    controller: Chill\EventBundle\Controller\StatusController::createAction
     methods:  POST
 
 chill_event_admin_status_edit:
     path:     /{id}/edit
-    defaults: { _controller: "ChillEventBundle:Status:edit" }
+    controller: Chill\EventBundle\Controller\StatusController::editAction
 
 chill_event_admin_status_update:
     path:     /{id}/update
-    defaults: { _controller: "ChillEventBundle:Status:update" }
+    controller: Chill\EventBundle\Controller\StatusController::updateAction
     methods:  [POST, PUT]
 
 chill_event_admin_status_delete:
     path:     /{id}/delete
-    defaults: { _controller: "ChillEventBundle:Status:delete" }
+    controller: Chill\EventBundle\Controller\StatusController::deleteAction
     methods:  [POST, DELETE]
diff --git a/Resources/config/services.yml b/config/services.yaml
similarity index 100%
rename from Resources/config/services.yml
rename to config/services.yaml
diff --git a/Resources/config/services/authorization.yml b/config/services/authorization.yaml
similarity index 100%
rename from Resources/config/services/authorization.yml
rename to config/services/authorization.yaml
diff --git a/Resources/config/services/controller.yml b/config/services/controller.yaml
similarity index 100%
rename from Resources/config/services/controller.yml
rename to config/services/controller.yaml
diff --git a/Resources/config/services/fixtures.yml b/config/services/fixtures.yaml
similarity index 67%
rename from Resources/config/services/fixtures.yml
rename to config/services/fixtures.yaml
index a51618f43..c39947899 100644
--- a/Resources/config/services/fixtures.yml
+++ b/config/services/fixtures.yaml
@@ -1,4 +1,4 @@
 services:
     Chill\EventBundle\DataFixtures\ORM\:
-        resource: ../../../DataFixtures/ORM
+        resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/Resources/config/services/forms.yml b/config/services/forms.yaml
similarity index 100%
rename from Resources/config/services/forms.yml
rename to config/services/forms.yaml
diff --git a/Resources/config/services/menu.yml b/config/services/menu.yaml
similarity index 100%
rename from Resources/config/services/menu.yml
rename to config/services/menu.yaml
diff --git a/Resources/config/services/repositories.yml b/config/services/repositories.yaml
similarity index 100%
rename from Resources/config/services/repositories.yml
rename to config/services/repositories.yaml
diff --git a/Resources/config/services/search.yml b/config/services/search.yaml
similarity index 100%
rename from Resources/config/services/search.yml
rename to config/services/search.yaml
diff --git a/Resources/config/services/timeline.yml b/config/services/timeline.yaml
similarity index 100%
rename from Resources/config/services/timeline.yml
rename to config/services/timeline.yaml
diff --git a/Resources/config/validation.yml b/config/validation.yaml
similarity index 100%
rename from Resources/config/validation.yml
rename to config/validation.yaml