diff --git a/DependencyInjection/ChillEventExtension.php b/DependencyInjection/ChillEventExtension.php
index 29c4d6349..977a9d9dd 100644
--- a/DependencyInjection/ChillEventExtension.php
+++ b/DependencyInjection/ChillEventExtension.php
@@ -26,6 +26,14 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
 
         $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');
     }
     
      /* (non-PHPdoc)
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 9658882d7..0282f881a 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,14 +1,4 @@
 services:
     Chill\EventBundle\:
-        resource: '../..'
+        resource: '../../*'
         exclude: '../../{Entity,Resources/migrations,Resources/test}'
-
-imports:
-    - { resource: './services/authorization.yml' }
-    - { resource: './services/controller.yml' }
-    - { resource: './services/fixtures.yml' }
-    - { resource: './services/forms.yml' }
-    - { resource: './services/menu.yml' }
-    - { resource: './services/repositories.yml' }
-    - { resource: './services/search.yml' }
-    - { resource: './services/timeline.yml' }
diff --git a/Resources/config/services/controller.yml b/Resources/config/services/controller.yml
index 3ad4136c5..a2e5e7a65 100644
--- a/Resources/config/services/controller.yml
+++ b/Resources/config/services/controller.yml
@@ -1,8 +1,10 @@
 services:
+
     Chill\EventBundle\Controller\EventController:
         arguments:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
             $formFactoryInterface: '@Symfony\Component\Form\FormFactoryInterface'
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags: ['controller.service_arguments']
+        public: true
+