diff --git a/DependencyInjection/ChillTaskExtension.php b/DependencyInjection/ChillTaskExtension.php
index 3eda043a5..5ffbd38e7 100644
--- a/DependencyInjection/ChillTaskExtension.php
+++ b/DependencyInjection/ChillTaskExtension.php
@@ -25,17 +25,17 @@ class ChillTaskExtension 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/controller.yml');
-        $loader->load('services/security.yml');
-        $loader->load('services/repositories.yml');
-        $loader->load('services/workflow.yml');
-        $loader->load('services/templating.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/event.yml');
-        $loader->load('services/timeline.yml');
-        $loader->load('services/fixtures.yml');
-        $loader->load('services/form.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services/controller.yaml');
+        $loader->load('services/security.yaml');
+        $loader->load('services/repositories.yaml');
+        $loader->load('services/workflow.yaml');
+        $loader->load('services/templating.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/event.yaml');
+        $loader->load('services/timeline.yaml');
+        $loader->load('services/fixtures.yaml');
+        $loader->load('services/form.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -51,7 +51,7 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
         $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillTaskBundle/Resources/config/routing.yml'
+                 '@ChillTaskBundle/config/routes.yaml'
               )
            )
         ));
diff --git a/Resources/config/routing.yml b/config/routes.yaml
similarity index 100%
rename from Resources/config/routing.yml
rename to config/routes.yaml
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 90%
rename from Resources/config/services/controller.yml
rename to config/services/controller.yaml
index 130db2175..461f65f01 100644
--- a/Resources/config/services/controller.yml
+++ b/config/services/controller.yaml
@@ -1,6 +1,6 @@
 services:
     Chill\TaskBundle\Controller\:
-        resource: '../../../Controller'
+        resource: '../../Controller'
         tags: ['controller.service_arguments']
 
     Chill\TaskBundle\Controller\SingleTaskController:
diff --git a/Resources/config/services/event.yml b/config/services/event.yaml
similarity index 100%
rename from Resources/config/services/event.yml
rename to config/services/event.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 38f9fa785..6523f4376 100644
--- a/Resources/config/services/fixtures.yml
+++ b/config/services/fixtures.yaml
@@ -1,4 +1,4 @@
 services:
     Chill\TaskBundle\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/security.yml b/config/services/security.yaml
similarity index 100%
rename from Resources/config/services/security.yml
rename to config/services/security.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
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/services/workflow.yml b/config/services/workflow.yaml
similarity index 100%
rename from Resources/config/services/workflow.yml
rename to config/services/workflow.yaml