diff --git a/DependencyInjection/ChillAMLIBudgetExtension.php b/DependencyInjection/ChillAMLIBudgetExtension.php
index 6ad8898ee..edbf226b6 100644
--- a/DependencyInjection/ChillAMLIBudgetExtension.php
+++ b/DependencyInjection/ChillAMLIBudgetExtension.php
@@ -24,14 +24,14 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services/config.yml');
-        $loader->load('services/form.yml');
-        $loader->load('services/security.yml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/templating.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/calculator.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services/config.yaml');
+        $loader->load('services/form.yaml');
+        $loader->load('services/security.yaml');
+        $loader->load('services/controller.yaml');
+        $loader->load('services/templating.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/calculator.yaml');
         
         $this->storeConfig('resources', $config, $container);
         $this->storeConfig('charges', $config, $container);
@@ -69,7 +69,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillAMLIBudgetBundle/Resources/config/routing.yml'
+                 '@ChillAMLIBudgetBundle/config/routing.yaml'
               )
            )
         ));
diff --git a/Resources/config/routing.yml b/config/routing.yaml
similarity index 100%
rename from Resources/config/routing.yml
rename to config/routing.yaml
diff --git a/Resources/config/services/calculator.yml b/config/services/calculator.yaml
similarity index 100%
rename from Resources/config/services/calculator.yml
rename to config/services/calculator.yaml
diff --git a/Resources/config/services/config.yml b/config/services/config.yaml
similarity index 100%
rename from Resources/config/services/config.yml
rename to config/services/config.yaml
diff --git a/Resources/config/services/controller.yml b/config/services/controller.yaml
similarity index 75%
rename from Resources/config/services/controller.yml
rename to config/services/controller.yaml
index f69837a58..6c554dcb0 100644
--- a/Resources/config/services/controller.yml
+++ b/config/services/controller.yaml
@@ -1,5 +1,5 @@
 services:
     Chill\AMLI\BudgetBundle\Controller\:
         autowire: true
-        resource: '../../../Controller'
+        resource: '../../Controller'
         tags: ['controller.service_arguments']
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/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