diff --git a/DependencyInjection/ChillActivityExtension.php b/DependencyInjection/ChillActivityExtension.php
index 1bc1c4bb9..b43703b67 100644
--- a/DependencyInjection/ChillActivityExtension.php
+++ b/DependencyInjection/ChillActivityExtension.php
@@ -47,15 +47,15 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-        $loader->load('services/export.yml');
-        $loader->load('services/repositories.yml');
-        $loader->load('services/fixtures.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/form.yml');
-        $loader->load('services/templating.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/export.yaml');
+        $loader->load('services/repositories.yaml');
+        $loader->load('services/fixtures.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/controller.yaml');
+        $loader->load('services/form.yaml');
+        $loader->load('services/templating.yaml');
     }
     
     public function prepend(ContainerBuilder $container)
@@ -73,7 +73,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillActivityBundle/Resources/config/routing.yml'
+                 '@ChillActivityBundle/config/routes.yaml'
               )
            )
         ));
diff --git a/Resources/config/routing.yml b/config/routes.yaml
similarity index 57%
rename from Resources/config/routing.yml
rename to config/routes.yaml
index 12f84465f..9d73e3bb1 100644
--- a/Resources/config/routing.yml
+++ b/config/routes.yaml
@@ -1,22 +1,22 @@
 chill_activity_activity:
-    resource: "@ChillActivityBundle/Resources/config/routing/activity.yml"
+    resource: "@ChillActivityBundle/config/routes/activity.yaml"
     prefix:   /
 
 chill_activity_activityreason:
-    resource: "@ChillActivityBundle/Resources/config/routing/activityreason.yml"
+    resource: "@ChillActivityBundle/config/routes/activityreason.yaml"
     prefix:   /
 
 chill_activity_activityreasoncategory:
-    resource: "@ChillActivityBundle/Resources/config/routing/activityreasoncategory.yml"
+    resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
     prefix:   /
 
 chill_activity_activitytype:
-    resource: "@ChillActivityBundle/Resources/config/routing/activitytype.yml"
+    resource: "@ChillActivityBundle/config/routes/activitytype.yaml"
     prefix:   /
 
 chill_admin_activity_index:
     path:     /{_locale}/admin/activity
-    defaults: { _controller: ChillActivityBundle:Admin:indexActivity }
+    controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
     options:
         menus:
             admin_section:
@@ -26,8 +26,7 @@ chill_admin_activity_index:
 
 chill_admin_activity_redirect_to_admin_index:
     path:     /{_locale}/admin/activity_redirect_to_main
-    defaults:
-        _controller: ChillActivityBundle:Admin:redirectToAdminIndex
+    controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
     options:
         menus:
             admin_activity:
diff --git a/Resources/config/routing/activity.yml b/config/routes/activity.yaml
similarity index 56%
rename from Resources/config/routing/activity.yml
rename to config/routes/activity.yaml
index 5b49b93e5..a320bb2ac 100644
--- a/Resources/config/routing/activity.yml
+++ b/config/routes/activity.yaml
@@ -1,30 +1,30 @@
 chill_activity_activity_list:
     path:     /{_locale}/person/{person_id}/activity/
-    defaults: { _controller: "ChillActivityBundle:Activity:list" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::listAction
 
 chill_activity_activity_show:
     path:     /{_locale}/person/{person_id}/activity/{id}/show
-    defaults: { _controller: "ChillActivityBundle:Activity:show" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::showAction
 
 chill_activity_activity_new:
     path:     /{_locale}/person/{person_id}/activity/new
-    defaults: { _controller: "ChillActivityBundle:Activity:new" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::newAction
 
 chill_activity_activity_create:
     path:     /{_locale}/person/{person_id}/activity/create
-    defaults: { _controller: "ChillActivityBundle:Activity:create" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::createAction
     methods:  POST
 
 chill_activity_activity_edit:
     path:     /{_locale}/person/{person_id}/activity/{id}/edit
-    defaults: { _controller: "ChillActivityBundle:Activity:edit" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::editAction
 
 chill_activity_activity_update:
     path:     /{_locale}/person/{person_id}/activity/{id}/update
-    defaults: { _controller: "ChillActivityBundle:Activity:update" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::updateAction
     methods:  [POST, PUT]
 
 chill_activity_activity_delete:
     path:     /{_locale}/person/{person_id}/activity/{id}/delete
-    defaults: { _controller: "ChillActivityBundle:Activity:delete" }
+    controller: Chill\ActivityBundle\Controller\ActivityController::deleteAction
     methods:  [GET, POST, DELETE]
diff --git a/Resources/config/routing/activityreason.yml b/config/routes/activityreason.yaml
similarity index 58%
rename from Resources/config/routing/activityreason.yml
rename to config/routes/activityreason.yaml
index 497cf81c0..0fddb0685 100644
--- a/Resources/config/routing/activityreason.yml
+++ b/config/routes/activityreason.yaml
@@ -1,6 +1,6 @@
 chill_activity_activityreason:
     path:     /{_locale}/admin/activityreason/
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:index" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::indexAction
     options:
         menus:
             admin_activity: 
@@ -9,27 +9,27 @@ chill_activity_activityreason:
 
 chill_activity_activityreason_show:
     path:     /{_locale}/admin/activityreason/{id}/show
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:show" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::showAction
 
 chill_activity_activityreason_new:
     path:     /{_locale}/admin/activityreason/new
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:new" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::newAction
 
 chill_activity_activityreason_create:
     path:     /{_locale}/admin/activityreason/create
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:create" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::createAction
     methods:  POST
 
 chill_activity_activityreason_edit:
     path:     /{_locale}/admin/activityreason/{id}/edit
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:edit" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::editAction
 
 chill_activity_activityreason_update:
     path:     /{_locale}/admin/activityreason/{id}/update
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:update" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::updateAction
     methods:  [POST, PUT]
 
 chill_activity_activityreason_delete:
     path:     /{_locale}/admin/activityreason/{id}/delete
-    defaults: { _controller: "ChillActivityBundle:ActivityReason:delete" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonController::deleteAction
     methods:  [POST, DELETE]
diff --git a/Resources/config/routing/activityreasoncategory.yml b/config/routes/activityreasoncategory.yaml
similarity index 59%
rename from Resources/config/routing/activityreasoncategory.yml
rename to config/routes/activityreasoncategory.yaml
index 7053f6721..5de9d3f34 100644
--- a/Resources/config/routing/activityreasoncategory.yml
+++ b/config/routes/activityreasoncategory.yaml
@@ -1,6 +1,6 @@
 chill_activity_activityreasoncategory:
     path:     /{_locale}/admin/activityreasoncategory/
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:index" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::indexAction
     options:
         menus:
             admin_activity: 
@@ -9,27 +9,27 @@ chill_activity_activityreasoncategory:
 
 chill_activity_activityreasoncategory_show:
     path:     /{_locale}/admin/activityreasoncategory/{id}/show
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:show" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::showAction
 
 chill_activity_activityreasoncategory_new:
     path:     /{_locale}/admin/activityreasoncategory/new
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:new" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::newAction
 
 chill_activity_activityreasoncategory_create:
     path:     /{_locale}/admin/activityreasoncategory/create
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:create" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::createAction
     methods:  POST
 
 chill_activity_activityreasoncategory_edit:
     path:     /{_locale}/admin/activityreasoncategory/{id}/edit
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:edit" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::editAction
 
 chill_activity_activityreasoncategory_update:
     path:     /{_locale}/admin/activityreasoncategory/{id}/update
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:update" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::updateAction
     methods:  [POST, PUT]
 
 chill_activity_activityreasoncategory_delete:
     path:     /{_locale}/admin/activityreasoncategory/{id}/delete
-    defaults: { _controller: "ChillActivityBundle:ActivityReasonCategory:delete" }
+    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::deleteAction
     methods:  [POST, DELETE]
diff --git a/Resources/config/routing/activitytype.yml b/config/routes/activitytype.yaml
similarity index 57%
rename from Resources/config/routing/activitytype.yml
rename to config/routes/activitytype.yaml
index 3a73151a3..2995458f1 100644
--- a/Resources/config/routing/activitytype.yml
+++ b/config/routes/activitytype.yaml
@@ -1,6 +1,6 @@
 chill_activity_activitytype:
     path:     /{_locale}/admin/activitytype/
-    defaults: { _controller: "ChillActivityBundle:ActivityType:index" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::indexAction
     options:
         menus:
             admin_activity: 
@@ -9,27 +9,27 @@ chill_activity_activitytype:
 
 chill_activity_activitytype_show:
     path:     /{_locale}/admin/activitytype/{id}/show
-    defaults: { _controller: "ChillActivityBundle:ActivityType:show" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::showAction
 
 chill_activity_activitytype_new:
     path:     /{_locale}/admin/activitytype/new
-    defaults: { _controller: "ChillActivityBundle:ActivityType:new" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::newAction
 
 chill_activity_activitytype_create:
     path:     /{_locale}/admin/activitytype/create
-    defaults: { _controller: "ChillActivityBundle:ActivityType:create" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::createAction
     methods:  POST
 
 chill_activity_activitytype_edit:
     path:     /{_locale}/admin/activitytype/{id}/edit
-    defaults: { _controller: "ChillActivityBundle:ActivityType:edit" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::editAction
 
 chill_activity_activitytype_update:
     path:     /{_locale}/admin/activitytype/{id}/update
-    defaults: { _controller: "ChillActivityBundle:ActivityType:update" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::updateAction
     methods:  [POST, PUT]
 
 chill_activity_activitytype_delete:
     path:     /{_locale}/admin/activitytype/{id}/delete
-    defaults: { _controller: "ChillActivityBundle:ActivityType:delete" }
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::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/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/export.yml b/config/services/export.yaml
similarity index 100%
rename from Resources/config/services/export.yml
rename to config/services/export.yaml
diff --git a/Resources/config/services/fixtures.yml b/config/services/fixtures.yaml
similarity index 68%
rename from Resources/config/services/fixtures.yml
rename to config/services/fixtures.yaml
index 140386592..4851b7838 100644
--- a/Resources/config/services/fixtures.yml
+++ b/config/services/fixtures.yaml
@@ -1,4 +1,4 @@
 services:
     Chill\ActivityBundle\DataFixtures\ORM\:
-        resource: ../../../DataFixtures/ORM
+        resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/Resources/config/services/form.yml b/config/services/form.yaml
similarity index 100%
rename from Resources/config/services/form.yml
rename to config/services/form.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/templating.yml b/config/services/templating.yaml
similarity index 100%
rename from Resources/config/services/templating.yml
rename to config/services/templating.yaml