diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php
index d293cd562..faede8fc0 100644
--- a/DependencyInjection/ChillMainExtension.php
+++ b/DependencyInjection/ChillMainExtension.php
@@ -134,17 +134,6 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     
     public function prepend(ContainerBuilder $container) 
     {
-        $bundles = $container->getParameter('kernel.bundles');
-        //add ChillMain to assetic-enabled bundles
-        if (!isset($bundles['AsseticBundle'])) {
-            throw new MissingBundleException('AsseticBundle');
-        }
-
-        $asseticConfig = $container->getExtensionConfig('assetic');
-        $asseticConfig['bundles'][] = 'ChillMainBundle';
-        $container->prependExtensionConfig('assetic', 
-                array('bundles' => array('ChillMainBundle')));
-        
         //add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 04a1fb87a..d5024bf5d 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -37,8 +37,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_main');
+        $treeBuilder = new TreeBuilder('chill_main');
+        $rootNode = $treeBuilder->getRootNode('chill_main');
 
         $rootNode
             ->children()
diff --git a/DependencyInjection/Widget/AddWidgetConfigurationTrait.php b/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
index 81e91c53e..d3a874ff3 100644
--- a/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
+++ b/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
@@ -149,8 +149,8 @@ trait AddWidgetConfigurationTrait
      */
     protected function addWidgetsConfiguration($place, ContainerBuilder $containerBuilder)
     {
-        $treeBuilder = new TreeBuilder();
-        $root = $treeBuilder->root($place)
+        $treeBuilder = new TreeBuilder($place);
+        $root = $treeBuilder->getRootNode($place)
             ->canBeUnset()
             ->info('register widgets on place "'.$place.'"');
         
diff --git a/Notification/Mailer.php b/Notification/Mailer.php
index 2b784b3a1..3f83f6289 100644
--- a/Notification/Mailer.php
+++ b/Notification/Mailer.php
@@ -19,6 +19,7 @@ namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -75,10 +76,10 @@ class Mailer
     public function __construct(
         LoggerInterface $logger, 
         \Twig\Environment $twig, 
-        \Swift_Mailer $mailer, 
+        MailerInterface $mailer,
         // due to bug https://github.com/symfony/swiftmailer-bundle/issues/127
-        \Swift_Transport $mailerTransporter,
-        RouterInterface $router, 
+        // \Swift_Transport $mailerTransporter,
+        RouterInterface $router,
         TranslatorInterface $translator, 
         $routeParameters
     ) {
@@ -88,7 +89,7 @@ class Mailer
         $this->router = $router;
         $this->translator = $translator;
         $this->routeParameters = $routeParameters;
-        $this->forcedMailer = new \Swift_Mailer($mailerTransporter);
+        //$this->forcedMailer = new \Swift_Mailer($mailerTransporter);
     }
 
     
diff --git a/Pagination/ChillPaginationTwig.php b/Pagination/ChillPaginationTwig.php
index ef36685b4..daff5fe24 100644
--- a/Pagination/ChillPaginationTwig.php
+++ b/Pagination/ChillPaginationTwig.php
@@ -22,13 +22,16 @@
 
 namespace Chill\MainBundle\Pagination;
 
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
 /**
  * add twig function to render pagination
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @author Champs Libres <info@champs-libres.coop>
  */
-class ChillPaginationTwig extends \Twig_Extension
+class ChillPaginationTwig extends AbstractExtension
 {
     const LONG_TEMPLATE = 'ChillMainBundle:Pagination:long.html.twig';
     const SHORT_TEMPLATE = 'ChillMainBundle:Pagination:short.html.twig';
@@ -41,7 +44,7 @@ class ChillPaginationTwig extends \Twig_Extension
     public function getFunctions()
     {
         return array(
-           new \Twig_SimpleFunction(
+           new TwigFunction(
                  'chill_pagination',  
                  array($this, 'paginationRender'),
                  array(
diff --git a/Resources/config/services/notification.yml b/Resources/config/services/notification.yml
index 54d63365c..aee2b79f5 100644
--- a/Resources/config/services/notification.yml
+++ b/Resources/config/services/notification.yml
@@ -4,7 +4,7 @@ services:
             - "@logger"
             - "@twig"
             - "@mailer"
-            - "@swiftmailer.transport"
+            # - "@swiftmailer.transport"
             - "@router"
             - "@translator"
             - "%chill_main.notifications%"
diff --git a/Resources/config/services/redis.yml b/Resources/config/services/redis.yml
index b76555161..c8d5c2879 100644
--- a/Resources/config/services/redis.yml
+++ b/Resources/config/services/redis.yml
@@ -6,5 +6,5 @@ services:
             - { name: kernel.event_subcriber }
             
     Chill\MainBundle\Redis\ChillRedis:
-        factory: 'Chill\MainBundle\Redis\RedisConnectionFactory:create'
+        factory: [ '@Chill\MainBundle\Redis\RedisConnectionFactory', 'create' ]
             
\ No newline at end of file
diff --git a/Resources/config/services/templating.yml b/Resources/config/services/templating.yml
index 49836e3f9..3f75eaf6e 100644
--- a/Resources/config/services/templating.yml
+++ b/Resources/config/services/templating.yml
@@ -1,20 +1,20 @@
 services:
-    twig_intl:
-        class: Twig_Extensions_Extension_Intl
-        tags: 
-            - { name: twig.extension }
-            
-    twig_date:
-        class: Twig_Extensions_Extension_Date
-        arguments:
-            - "@translator"
-        tags: 
-            - { name: twig.extension }
-            
-    twig_text:
-        class: Twig_Extensions_Extension_Text
-        tags:
-            - { name: twig.extension }
+#    twig_intl:
+#        class: Twig_Extensions_Extension_Intl
+#        tags:
+#            - { name: twig.extension }
+#
+#    twig_date:
+#        class: Twig_Extensions_Extension_Date
+#        arguments:
+#            - "@translator"
+#        tags:
+#            - { name: twig.extension }
+#
+#    twig_text:
+#        class: Twig_Extensions_Extension_Text
+#        tags:
+#            - { name: twig.extension }
     
     Chill\MainBundle\Templating\ChillTwigHelper:
         tags:
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index dff771512..34534b0be 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -80,7 +80,6 @@ Create: Créer
 show: voir
 Show: Voir
 edit: modifier
-Edit: Modifier
 Main admin menu: Menu d'administration principal
 Actions: Actions
 Users and permissions: Utilisateurs et permissions
@@ -111,7 +110,6 @@ Permission group: Groupe de permissions
 Permissionsgroup: Group de permissions
 New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
-Grant new permissions: Attribuer de nouvelles permissions
 Role: Rôle
 Choose amongst roles: Choisir parmi les rôles
 Add permission: Ajouter les permissions
diff --git a/Routing/MenuTwig.php b/Routing/MenuTwig.php
index fe911d395..c6a8d1aa2 100644
--- a/Routing/MenuTwig.php
+++ b/Routing/MenuTwig.php
@@ -24,13 +24,15 @@ namespace Chill\MainBundle\Routing;
 use Chill\MainBundle\Routing\MenuComposer;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * Add the filter 'chill_menu'
  *
  * @author Julien Fastré <julien arobase fastre point info>
  */
-class MenuTwig extends \Twig_Extension implements ContainerAwareInterface
+class MenuTwig extends AbstractExtension implements ContainerAwareInterface
 {
     
     /**
@@ -63,7 +65,7 @@ class MenuTwig extends \Twig_Extension implements ContainerAwareInterface
     
     public function getFunctions()
     {
-        return [new \Twig_SimpleFunction('chill_menu', 
+        return [new TwigFunction('chill_menu',
                 array($this, 'chillMenu'), array(
                     'is_safe' => array('html'),
                     'needs_environment' => true
diff --git a/Templating/CSVCellTwig.php b/Templating/CSVCellTwig.php
index 0d65dd038..f587b41fe 100644
--- a/Templating/CSVCellTwig.php
+++ b/Templating/CSVCellTwig.php
@@ -22,13 +22,16 @@
 
 namespace Chill\MainBundle\Templating;
 
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
 /**
  * Twig filter to transform a string in a safer way to be the content of a csv
  * cell.
  * 
  * This filter replace the char " by ""
  */
-class CSVCellTwig extends \Twig_Extension
+class CSVCellTwig extends AbstractExtension
 {
     /*
      * Returns a list of filters to add to the existing list.
@@ -39,7 +42,7 @@ class CSVCellTwig extends \Twig_Extension
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter(
+            new TwigFilter(
                 'csv_cell',
                 array($this, 'csvCellFilter'),
                 array('is_safe' => array('html')))
diff --git a/Templating/ChillTwigRoutingHelper.php b/Templating/ChillTwigRoutingHelper.php
index 94b8a6c24..c3f0f0688 100644
--- a/Templating/ChillTwigRoutingHelper.php
+++ b/Templating/ChillTwigRoutingHelper.php
@@ -21,6 +21,7 @@
 namespace Chill\MainBundle\Templating;
 
 use Twig\Extension\AbstractExtension;
+use Twig\Node\Node;
 use Twig\TwigFunction;
 use Twig\TwigFilter;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -72,7 +73,7 @@ class ChillTwigRoutingHelper extends AbstractExtension
         ];
     }
     
-    public function isUrlGenerationSafe(\Twig_Node $argsNode)
+    public function isUrlGenerationSafe(Node $argsNode)
     {
         return $this->originalExtension->isUrlGenerationSafe($argsNode);
     }
diff --git a/Templating/TranslatableStringTwig.php b/Templating/TranslatableStringTwig.php
index ed1cdc88b..e2d89e8d1 100644
--- a/Templating/TranslatableStringTwig.php
+++ b/Templating/TranslatableStringTwig.php
@@ -22,8 +22,10 @@
 namespace Chill\MainBundle\Templating;
 
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
-class TranslatableStringTwig extends \Twig_Extension
+class TranslatableStringTwig extends AbstractExtension
 {
     use ContainerAwareTrait;
     
@@ -51,7 +53,7 @@ class TranslatableStringTwig extends \Twig_Extension
     public function getFilters()
     {
         return array(
-            new \Twig_SimpleFilter(
+            new TwigFilter(
                 'localize_translatable_string', array($this, 'localize')));
     }
     
diff --git a/Templating/Widget/WidgetRenderingTwig.php b/Templating/Widget/WidgetRenderingTwig.php
index 083921778..4e2779b2d 100644
--- a/Templating/Widget/WidgetRenderingTwig.php
+++ b/Templating/Widget/WidgetRenderingTwig.php
@@ -22,6 +22,8 @@ namespace Chill\MainBundle\Templating\Widget;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * Add the function `chill_delegated_block`.
@@ -49,7 +51,7 @@ use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class WidgetRenderingTwig extends \Twig_Extension
+class WidgetRenderingTwig extends AbstractExtension
 {
     
     /**
@@ -90,14 +92,14 @@ class WidgetRenderingTwig extends \Twig_Extension
     public function getFunctions()
     {
         return array(
-            new \Twig_SimpleFunction('chill_delegated_block', 
+            new TwigFunction('chill_delegated_block',
                     array($this, 'renderingWidget'),
                     array(
                         'is_safe' => array('html'), 
                         'needs_environment' => true,
                         'deprecated' => true, 'alternative' => 'chill_widget'
                         )),
-            new \Twig_SimpleFunction('chill_widget', 
+            new TwigFunction('chill_widget',
                     array($this, 'renderingWidget'),
                     array('is_safe' => array('html'), 'needs_environment' => true))
         );
diff --git a/Resources/views/Address/macro.html.twig b/templates/Address/macro.html.twig
similarity index 100%
rename from Resources/views/Address/macro.html.twig
rename to templates/Address/macro.html.twig
diff --git a/Resources/views/Admin/index.html.twig b/templates/Admin/index.html.twig
similarity index 100%
rename from Resources/views/Admin/index.html.twig
rename to templates/Admin/index.html.twig
diff --git a/Resources/views/Admin/layout.html.twig b/templates/Admin/layout.html.twig
similarity index 100%
rename from Resources/views/Admin/layout.html.twig
rename to templates/Admin/layout.html.twig
diff --git a/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/templates/Admin/layoutWithVerticalMenu.html.twig
similarity index 100%
rename from Resources/views/Admin/layoutWithVerticalMenu.html.twig
rename to templates/Admin/layoutWithVerticalMenu.html.twig
diff --git a/Resources/views/Admin/layout_permissions.html.twig b/templates/Admin/layout_permissions.html.twig
similarity index 100%
rename from Resources/views/Admin/layout_permissions.html.twig
rename to templates/Admin/layout_permissions.html.twig
diff --git a/Resources/views/CRUD/_delete_content.html.twig b/templates/CRUD/_delete_content.html.twig
similarity index 100%
rename from Resources/views/CRUD/_delete_content.html.twig
rename to templates/CRUD/_delete_content.html.twig
diff --git a/Resources/views/CRUD/_edit_content.html.twig b/templates/CRUD/_edit_content.html.twig
similarity index 100%
rename from Resources/views/CRUD/_edit_content.html.twig
rename to templates/CRUD/_edit_content.html.twig
diff --git a/Resources/views/CRUD/_edit_title.html.twig b/templates/CRUD/_edit_title.html.twig
similarity index 100%
rename from Resources/views/CRUD/_edit_title.html.twig
rename to templates/CRUD/_edit_title.html.twig
diff --git a/Resources/views/CRUD/_inc/default.html.twig b/templates/CRUD/_inc/default.html.twig
similarity index 100%
rename from Resources/views/CRUD/_inc/default.html.twig
rename to templates/CRUD/_inc/default.html.twig
diff --git a/Resources/views/CRUD/_index.html.twig b/templates/CRUD/_index.html.twig
similarity index 100%
rename from Resources/views/CRUD/_index.html.twig
rename to templates/CRUD/_index.html.twig
diff --git a/Resources/views/CRUD/_new_content.html.twig b/templates/CRUD/_new_content.html.twig
similarity index 100%
rename from Resources/views/CRUD/_new_content.html.twig
rename to templates/CRUD/_new_content.html.twig
diff --git a/Resources/views/CRUD/_new_title.html.twig b/templates/CRUD/_new_title.html.twig
similarity index 100%
rename from Resources/views/CRUD/_new_title.html.twig
rename to templates/CRUD/_new_title.html.twig
diff --git a/Resources/views/CRUD/_view_content.html.twig b/templates/CRUD/_view_content.html.twig
similarity index 100%
rename from Resources/views/CRUD/_view_content.html.twig
rename to templates/CRUD/_view_content.html.twig
diff --git a/Resources/views/CRUD/_view_title.html.twig b/templates/CRUD/_view_title.html.twig
similarity index 100%
rename from Resources/views/CRUD/_view_title.html.twig
rename to templates/CRUD/_view_title.html.twig
diff --git a/Resources/views/CRUD/delete.html.twig b/templates/CRUD/delete.html.twig
similarity index 100%
rename from Resources/views/CRUD/delete.html.twig
rename to templates/CRUD/delete.html.twig
diff --git a/Resources/views/CRUD/edit.html.twig b/templates/CRUD/edit.html.twig
similarity index 100%
rename from Resources/views/CRUD/edit.html.twig
rename to templates/CRUD/edit.html.twig
diff --git a/Resources/views/CRUD/index.html.twig b/templates/CRUD/index.html.twig
similarity index 100%
rename from Resources/views/CRUD/index.html.twig
rename to templates/CRUD/index.html.twig
diff --git a/Resources/views/CRUD/new.html.twig b/templates/CRUD/new.html.twig
similarity index 100%
rename from Resources/views/CRUD/new.html.twig
rename to templates/CRUD/new.html.twig
diff --git a/Resources/views/CRUD/view.html.twig b/templates/CRUD/view.html.twig
similarity index 100%
rename from Resources/views/CRUD/view.html.twig
rename to templates/CRUD/view.html.twig
diff --git a/Resources/views/Center/edit.html.twig b/templates/Center/edit.html.twig
similarity index 100%
rename from Resources/views/Center/edit.html.twig
rename to templates/Center/edit.html.twig
diff --git a/Resources/views/Center/index.html.twig b/templates/Center/index.html.twig
similarity index 100%
rename from Resources/views/Center/index.html.twig
rename to templates/Center/index.html.twig
diff --git a/Resources/views/Center/new.html.twig b/templates/Center/new.html.twig
similarity index 100%
rename from Resources/views/Center/new.html.twig
rename to templates/Center/new.html.twig
diff --git a/Resources/views/Center/show.html.twig b/templates/Center/show.html.twig
similarity index 100%
rename from Resources/views/Center/show.html.twig
rename to templates/Center/show.html.twig
diff --git a/Resources/views/Export/download.html.twig b/templates/Export/download.html.twig
similarity index 100%
rename from Resources/views/Export/download.html.twig
rename to templates/Export/download.html.twig
diff --git a/Resources/views/Export/layout.html.twig b/templates/Export/layout.html.twig
similarity index 100%
rename from Resources/views/Export/layout.html.twig
rename to templates/Export/layout.html.twig
diff --git a/Resources/views/Export/new.html.twig b/templates/Export/new.html.twig
similarity index 100%
rename from Resources/views/Export/new.html.twig
rename to templates/Export/new.html.twig
diff --git a/Resources/views/Export/new_centers_step.html.twig b/templates/Export/new_centers_step.html.twig
similarity index 100%
rename from Resources/views/Export/new_centers_step.html.twig
rename to templates/Export/new_centers_step.html.twig
diff --git a/Resources/views/Export/new_formatter_step.html.twig b/templates/Export/new_formatter_step.html.twig
similarity index 100%
rename from Resources/views/Export/new_formatter_step.html.twig
rename to templates/Export/new_formatter_step.html.twig
diff --git a/Resources/views/Extensions/PrintOrMessage/blockquote.html.twig b/templates/Extensions/PrintOrMessage/blockquote.html.twig
similarity index 100%
rename from Resources/views/Extensions/PrintOrMessage/blockquote.html.twig
rename to templates/Extensions/PrintOrMessage/blockquote.html.twig
diff --git a/Resources/views/Extensions/PrintOrMessage/blockquote_date.html.twig b/templates/Extensions/PrintOrMessage/blockquote_date.html.twig
similarity index 100%
rename from Resources/views/Extensions/PrintOrMessage/blockquote_date.html.twig
rename to templates/Extensions/PrintOrMessage/blockquote_date.html.twig
diff --git a/Resources/views/Extensions/PrintOrMessage/default.html.twig b/templates/Extensions/PrintOrMessage/default.html.twig
similarity index 100%
rename from Resources/views/Extensions/PrintOrMessage/default.html.twig
rename to templates/Extensions/PrintOrMessage/default.html.twig
diff --git a/Resources/views/Extensions/PrintOrMessage/default_date.html.twig b/templates/Extensions/PrintOrMessage/default_date.html.twig
similarity index 100%
rename from Resources/views/Extensions/PrintOrMessage/default_date.html.twig
rename to templates/Extensions/PrintOrMessage/default_date.html.twig
diff --git a/Resources/views/Form/fields.html.twig b/templates/Form/fields.html.twig
similarity index 100%
rename from Resources/views/Form/fields.html.twig
rename to templates/Form/fields.html.twig
diff --git a/Resources/views/Layout/_footer.html.twig b/templates/Layout/_footer.html.twig
similarity index 100%
rename from Resources/views/Layout/_footer.html.twig
rename to templates/Layout/_footer.html.twig
diff --git a/Resources/views/Layout/_header-logo.html.twig b/templates/Layout/_header-logo.html.twig
similarity index 100%
rename from Resources/views/Layout/_header-logo.html.twig
rename to templates/Layout/_header-logo.html.twig
diff --git a/Resources/views/Login/_footer.html.twig b/templates/Login/_footer.html.twig
similarity index 100%
rename from Resources/views/Login/_footer.html.twig
rename to templates/Login/_footer.html.twig
diff --git a/Resources/views/Login/_login-logo.html.twig b/templates/Login/_login-logo.html.twig
similarity index 100%
rename from Resources/views/Login/_login-logo.html.twig
rename to templates/Login/_login-logo.html.twig
diff --git a/Resources/views/Login/login.html.twig b/templates/Login/login.html.twig
similarity index 100%
rename from Resources/views/Login/login.html.twig
rename to templates/Login/login.html.twig
diff --git a/Resources/views/Menu/admin.html.twig b/templates/Menu/admin.html.twig
similarity index 100%
rename from Resources/views/Menu/admin.html.twig
rename to templates/Menu/admin.html.twig
diff --git a/Resources/views/Menu/adminSection.html.twig b/templates/Menu/adminSection.html.twig
similarity index 100%
rename from Resources/views/Menu/adminSection.html.twig
rename to templates/Menu/adminSection.html.twig
diff --git a/Resources/views/Menu/admin_permissions.html.twig b/templates/Menu/admin_permissions.html.twig
similarity index 100%
rename from Resources/views/Menu/admin_permissions.html.twig
rename to templates/Menu/admin_permissions.html.twig
diff --git a/Resources/views/Menu/defaultMenu.html.twig b/templates/Menu/defaultMenu.html.twig
similarity index 100%
rename from Resources/views/Menu/defaultMenu.html.twig
rename to templates/Menu/defaultMenu.html.twig
diff --git a/Resources/views/Menu/export.html.twig b/templates/Menu/export.html.twig
similarity index 100%
rename from Resources/views/Menu/export.html.twig
rename to templates/Menu/export.html.twig
diff --git a/Resources/views/Menu/section.html.twig b/templates/Menu/section.html.twig
similarity index 100%
rename from Resources/views/Menu/section.html.twig
rename to templates/Menu/section.html.twig
diff --git a/Resources/views/Menu/user.html.twig b/templates/Menu/user.html.twig
similarity index 100%
rename from Resources/views/Menu/user.html.twig
rename to templates/Menu/user.html.twig
diff --git a/Resources/views/Menu/verticalMenu.html.twig b/templates/Menu/verticalMenu.html.twig
similarity index 100%
rename from Resources/views/Menu/verticalMenu.html.twig
rename to templates/Menu/verticalMenu.html.twig
diff --git a/Resources/views/Pagination/long.html.twig b/templates/Pagination/long.html.twig
similarity index 100%
rename from Resources/views/Pagination/long.html.twig
rename to templates/Pagination/long.html.twig
diff --git a/Resources/views/Password/password.html.twig b/templates/Password/password.html.twig
similarity index 100%
rename from Resources/views/Password/password.html.twig
rename to templates/Password/password.html.twig
diff --git a/Resources/views/Password/recover_email.txt.twig b/templates/Password/recover_email.txt.twig
similarity index 100%
rename from Resources/views/Password/recover_email.txt.twig
rename to templates/Password/recover_email.txt.twig
diff --git a/Resources/views/Password/recover_layout.html.twig b/templates/Password/recover_layout.html.twig
similarity index 100%
rename from Resources/views/Password/recover_layout.html.twig
rename to templates/Password/recover_layout.html.twig
diff --git a/Resources/views/Password/recover_password_changed.html.twig b/templates/Password/recover_password_changed.html.twig
similarity index 100%
rename from Resources/views/Password/recover_password_changed.html.twig
rename to templates/Password/recover_password_changed.html.twig
diff --git a/Resources/views/Password/recover_password_form.html.twig b/templates/Password/recover_password_form.html.twig
similarity index 100%
rename from Resources/views/Password/recover_password_form.html.twig
rename to templates/Password/recover_password_form.html.twig
diff --git a/Resources/views/Password/request_recover_password.html.twig b/templates/Password/request_recover_password.html.twig
similarity index 100%
rename from Resources/views/Password/request_recover_password.html.twig
rename to templates/Password/request_recover_password.html.twig
diff --git a/Resources/views/Password/request_recover_password_confirm.html.twig b/templates/Password/request_recover_password_confirm.html.twig
similarity index 100%
rename from Resources/views/Password/request_recover_password_confirm.html.twig
rename to templates/Password/request_recover_password_confirm.html.twig
diff --git a/Resources/views/PermissionsGroup/edit.html.twig b/templates/PermissionsGroup/edit.html.twig
similarity index 100%
rename from Resources/views/PermissionsGroup/edit.html.twig
rename to templates/PermissionsGroup/edit.html.twig
diff --git a/Resources/views/PermissionsGroup/index.html.twig b/templates/PermissionsGroup/index.html.twig
similarity index 100%
rename from Resources/views/PermissionsGroup/index.html.twig
rename to templates/PermissionsGroup/index.html.twig
diff --git a/Resources/views/PermissionsGroup/new.html.twig b/templates/PermissionsGroup/new.html.twig
similarity index 100%
rename from Resources/views/PermissionsGroup/new.html.twig
rename to templates/PermissionsGroup/new.html.twig
diff --git a/Resources/views/PermissionsGroup/show.html.twig b/templates/PermissionsGroup/show.html.twig
similarity index 100%
rename from Resources/views/PermissionsGroup/show.html.twig
rename to templates/PermissionsGroup/show.html.twig
diff --git a/Resources/views/Scope/edit.html.twig b/templates/Scope/edit.html.twig
similarity index 100%
rename from Resources/views/Scope/edit.html.twig
rename to templates/Scope/edit.html.twig
diff --git a/Resources/views/Scope/index.html.twig b/templates/Scope/index.html.twig
similarity index 100%
rename from Resources/views/Scope/index.html.twig
rename to templates/Scope/index.html.twig
diff --git a/Resources/views/Scope/new.html.twig b/templates/Scope/new.html.twig
similarity index 100%
rename from Resources/views/Scope/new.html.twig
rename to templates/Scope/new.html.twig
diff --git a/Resources/views/Scope/show.html.twig b/templates/Scope/show.html.twig
similarity index 100%
rename from Resources/views/Scope/show.html.twig
rename to templates/Scope/show.html.twig
diff --git a/Resources/views/Search/advanced_search.html.twig b/templates/Search/advanced_search.html.twig
similarity index 100%
rename from Resources/views/Search/advanced_search.html.twig
rename to templates/Search/advanced_search.html.twig
diff --git a/Resources/views/Search/error.html.twig b/templates/Search/error.html.twig
similarity index 100%
rename from Resources/views/Search/error.html.twig
rename to templates/Search/error.html.twig
diff --git a/Resources/views/Search/list.html.twig b/templates/Search/list.html.twig
similarity index 100%
rename from Resources/views/Search/list.html.twig
rename to templates/Search/list.html.twig
diff --git a/Resources/views/Tabs/README.md b/templates/Tabs/README.md
similarity index 100%
rename from Resources/views/Tabs/README.md
rename to templates/Tabs/README.md
diff --git a/Resources/views/Tabs/index.html.twig b/templates/Tabs/index.html.twig
similarity index 100%
rename from Resources/views/Tabs/index.html.twig
rename to templates/Tabs/index.html.twig
diff --git a/Resources/views/Tabs/macro.html.twig b/templates/Tabs/macro.html.twig
similarity index 100%
rename from Resources/views/Tabs/macro.html.twig
rename to templates/Tabs/macro.html.twig
diff --git a/Resources/views/Timeline/index.html.twig b/templates/Timeline/index.html.twig
similarity index 100%
rename from Resources/views/Timeline/index.html.twig
rename to templates/Timeline/index.html.twig
diff --git a/Resources/views/UI/notification_user_counter.html.twig b/templates/UI/notification_user_counter.html.twig
similarity index 100%
rename from Resources/views/UI/notification_user_counter.html.twig
rename to templates/UI/notification_user_counter.html.twig
diff --git a/Resources/views/User/edit.html.twig b/templates/User/edit.html.twig
similarity index 100%
rename from Resources/views/User/edit.html.twig
rename to templates/User/edit.html.twig
diff --git a/Resources/views/User/edit_password.html.twig b/templates/User/edit_password.html.twig
similarity index 100%
rename from Resources/views/User/edit_password.html.twig
rename to templates/User/edit_password.html.twig
diff --git a/Resources/views/User/index.html.twig b/templates/User/index.html.twig
similarity index 100%
rename from Resources/views/User/index.html.twig
rename to templates/User/index.html.twig
diff --git a/Resources/views/User/new.html.twig b/templates/User/new.html.twig
similarity index 100%
rename from Resources/views/User/new.html.twig
rename to templates/User/new.html.twig
diff --git a/Resources/views/User/show.html.twig b/templates/User/show.html.twig
similarity index 100%
rename from Resources/views/User/show.html.twig
rename to templates/User/show.html.twig
diff --git a/Resources/views/Util/confirmation_template.html.twig b/templates/Util/confirmation_template.html.twig
similarity index 100%
rename from Resources/views/Util/confirmation_template.html.twig
rename to templates/Util/confirmation_template.html.twig
diff --git a/Resources/views/layout.html.twig b/templates/layout.html.twig
similarity index 100%
rename from Resources/views/layout.html.twig
rename to templates/layout.html.twig
diff --git a/Resources/views/layoutWithVerticalMenu.html.twig b/templates/layoutWithVerticalMenu.html.twig
similarity index 100%
rename from Resources/views/layoutWithVerticalMenu.html.twig
rename to templates/layoutWithVerticalMenu.html.twig