diff --git a/DependencyInjection/ChillDocStoreExtension.php b/DependencyInjection/ChillDocStoreExtension.php
index ed36f1845..63de15f8b 100644
--- a/DependencyInjection/ChillDocStoreExtension.php
+++ b/DependencyInjection/ChillDocStoreExtension.php
@@ -24,13 +24,13 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $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/media.yml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/fixtures.yml');
-        $loader->load('services/form.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/media.yaml');
+        $loader->load('services/controller.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/fixtures.yaml');
+        $loader->load('services/form.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -46,8 +46,8 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                  '@ChillDocStoreBundle/Resources/config/routing.yml',
-                  '@ChampsLibresAsyncUploaderBundle/Resources/config/routing.yml'
+                  '@ChillDocStoreBundle/config/routes.yaml',
+                  '@ChampsLibresAsyncUploaderBundle/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 92%
rename from Resources/config/services/controller.yml
rename to config/services/controller.yaml
index 9108f293b..9899ffa2e 100644
--- a/Resources/config/services/controller.yml
+++ b/config/services/controller.yaml
@@ -1,6 +1,6 @@
 services:
     Chill\DocStoreBundle\Controller\:
-        resource: '../../../Controller'
+        resource: '../../Controller'
         tags: ['controller.service_arguments']
         
     Chill\DocStoreBundle\Controller\DocumentPersonController:
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 c9bc451d6..8a5b299ba 100644
--- a/Resources/config/services/fixtures.yml
+++ b/config/services/fixtures.yaml
@@ -1,4 +1,4 @@
 services:
     Chill\DocStoreBundle\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/media.yml b/config/services/media.yaml
similarity index 100%
rename from Resources/config/services/media.yml
rename to config/services/media.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