diff --git a/app/config/config.yml b/app/config/config.yml
index ea586721e..6422ac4c4 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -330,8 +330,6 @@ framework:
     csrf_protection: ~
     validation:      { enable_annotations: true }
     #serializer:      { enable_annotations: true }
-    templating:
-        engines: ['twig']
     default_locale:  "%locale%"
     trusted_hosts:   ~
     session:
@@ -350,6 +348,7 @@ twig:
     globals:
       photo_storage: '@AppBundle\CFP\PhotoStorage'
     form_themes: ['form_theme.html.twig']
+    exception_controller: null
 
 ting:
     connections:
diff --git a/sources/Afup/Utils/Mail.php b/sources/Afup/Utils/Mail.php
index 9f483166c..a08fbefa4 100644
--- a/sources/Afup/Utils/Mail.php
+++ b/sources/Afup/Utils/Mail.php
@@ -20,7 +20,7 @@ public static function createMailer(): Mailer
 
         return new Mailer(
             new NullLogger(),
-            new Environment(new FilesystemLoader(self::PROJECT_DIR . '/app/Resources/views/')),
+            new Environment(new FilesystemLoader(self::PROJECT_DIR . '/templates/')),
             PhpMailerAdapter::createFromConfiguration($configuration),
             $configuration
         );
diff --git a/sources/AppBundle/Controller/Admin/GetMenuAction.php b/sources/AppBundle/Controller/Admin/GetMenuAction.php
index b3e5dea0b..a8505b634 100644
--- a/sources/AppBundle/Controller/Admin/GetMenuAction.php
+++ b/sources/AppBundle/Controller/Admin/GetMenuAction.php
@@ -50,7 +50,7 @@ public function __invoke(): Response
             }
         }
 
-        return new Response($this->twig->render(':admin:menu.html.twig', [
+        return new Response($this->twig->render('admin/menu.html.twig', [
             'pages' => $this->backOfficePages,
             'current_group_key' => $currentGroupKey,
             'current_element_key' => $currentElementKey,
diff --git a/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php b/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php
index 53f4539e8..90f08ada5 100644
--- a/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php
+++ b/sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php
@@ -63,7 +63,7 @@ public function __invoke(Request $request)
             $this->flashBag->add('error', 'Une erreur est survenue lors de l\'ajout du flux');
         }
 
-        return new Response($this->twig->render(':admin/planete:feed_add.html.twig', [
+        return new Response($this->twig->render('admin/planete/feed_add.html.twig', [
             'form' => $form->createView(),
         ]));
     }
diff --git a/sources/AppBundle/Controller/Admin/TechLetter/TechLetterGenerateController.php b/sources/AppBundle/Controller/Admin/TechLetter/TechLetterGenerateController.php
index 4828acd3e..807ed202e 100644
--- a/sources/AppBundle/Controller/Admin/TechLetter/TechLetterGenerateController.php
+++ b/sources/AppBundle/Controller/Admin/TechLetter/TechLetterGenerateController.php
@@ -165,7 +165,7 @@ public function generate($techletterId, Request $request)
 
             $mailContent = $this
                 ->render(
-                    ':admin/techletter:mail_template.html.twig',
+                    'admin/techletter/mail_template.html.twig',
                     [
                         'tech_letter' => $techLetter,
                         'preview' => false
@@ -214,7 +214,7 @@ public function generate($techletterId, Request $request)
         }
 
         return $this->render(
-            ':admin/techletter:generate.html.twig',
+            'admin/techletter/generate.html.twig',
             [
                 'title' => "Veille de l'AFUP",
                 'sending' => $sending,
@@ -286,7 +286,7 @@ public function sendTest(Request $request): RedirectResponse
         $techLetter = Techletter\TechLetterFactory::createTechLetterFromJson($sending->getTechletter());
 
         $message = new Message($subject, null, new MailUser($this->techletterTestEmailAddress));
-        $this->mailer->renderTemplate($message,':admin/techletter:mail_template.html.twig', [
+        $this->mailer->renderTemplate($message,'admin/techletter/mail_template.html.twig', [
             'tech_letter' => $techLetter,
             'preview' => false,
         ]);
diff --git a/sources/AppBundle/Controller/Admin/VoteController.php b/sources/AppBundle/Controller/Admin/VoteController.php
index 8a01c7f68..77a21456c 100644
--- a/sources/AppBundle/Controller/Admin/VoteController.php
+++ b/sources/AppBundle/Controller/Admin/VoteController.php
@@ -50,7 +50,7 @@ public function index($eventSlug, $page = 1, $all = false): Response
     {
         $event = $this->eventActionHelper->getEvent($eventSlug);
         if (!$event->isVoteAvailable()) {
-            return $this->render(':event:cfp/closed.html.twig', ['event' => $event]);
+            return $this->render('event/cfp/closed.html.twig', ['event' => $event]);
         }
 
         /**
diff --git a/sources/AppBundle/Controller/Event/BlogController.php b/sources/AppBundle/Controller/Event/BlogController.php
index 735a62d75..b8838fbd9 100644
--- a/sources/AppBundle/Controller/Event/BlogController.php
+++ b/sources/AppBundle/Controller/Event/BlogController.php
@@ -41,7 +41,7 @@ public function program(Request $request, $eventSlug): Response
         $now = new \DateTime();
 
         return $this->render(
-            ':blog:program.html.twig',
+            'blog/program.html.twig',
             [
                 'talks' => iterator_to_array($talks),
                 'event' => $event,
@@ -148,7 +148,7 @@ public function planning(Request $request, string $eventSlug): Response
 
 
         return $this->render(
-            ':blog:planning.html.twig',
+            'blog/planning.html.twig',
                 [
                     'planning' => $eventPlanning,
                     'events' => $events,
@@ -183,7 +183,7 @@ public function talkWidget(Request $request): Response
         }
 
         return $this->render(
-            ':blog:talk.html.twig',
+            'blog/talk.html.twig',
             [
                 'talks_infos' => $talksInfos,
                 'speakers' => $speakers,
@@ -204,7 +204,7 @@ public function speakers(Request $request, string $eventSlug): Response
         $jsonld = $this->jsonLd->getDataForEvent($event);
 
         return $this->render(
-            ':blog:speakers.html.twig',
+            'blog/speakers.html.twig',
             [
                 'speakers' => iterator_to_array($speakers),
                 'event' => $event,
diff --git a/sources/AppBundle/Controller/Event/EventController.php b/sources/AppBundle/Controller/Event/EventController.php
index b62a26114..81fac691e 100644
--- a/sources/AppBundle/Controller/Event/EventController.php
+++ b/sources/AppBundle/Controller/Event/EventController.php
@@ -37,13 +37,13 @@ public function index()
         $events = $eventRepository->getNextEvents();
 
         if ($events === null) {
-            return $this->render(':event:none.html.twig');
+            return $this->render('event/none.html.twig');
         } elseif ($events->count() === 1) {
             $event = $events->first();
             return new RedirectResponse($this->generateUrl('event', ['eventSlug' => $event->getPath()]), Response::HTTP_TEMPORARY_REDIRECT);
         }
 
-        return $this->render(':event:switch.html.twig', ['events' => $events]);
+        return $this->render('event/switch.html.twig', ['events' => $events]);
     }
 
     public function speakerInfosIndex()
@@ -55,7 +55,7 @@ public function speakerInfosIndex()
         $event = $eventRepository->getNextEventForGithubUser($this->getUser());
 
         if ($event === null) {
-            return $this->render(':event:none.html.twig');
+            return $this->render('event/none.html.twig');
         }
 
         return new RedirectResponse($this->generateUrl('speaker-infos', ['eventSlug' => $event->getPath()]), Response::HTTP_TEMPORARY_REDIRECT);
@@ -72,13 +72,13 @@ public function event($eventSlug): Response
 
         if ($event->getDateEndCallForPapers() < $currentDate) {
             if (!$event->isVoteAvailable()) {
-                return $this->render(':event/cfp:closed.html.twig', ['event' => $event]);
+                return $this->render('event/cfp/closed.html.twig', ['event' => $event]);
             }
 
-            return $this->render(':event/cfp:vote_only.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
+            return $this->render('event/cfp/vote_only.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
         }
 
-        return $this->render(':event:home.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
+        return $this->render('event/home.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
     }
 
     /**
@@ -129,7 +129,7 @@ public function calendar($eventSlug): Response
             throw $this->createNotFoundException('Event not found');
         }
 
-        return $this->render(':event:calendar.html.twig', ['event' => $event]);
+        return $this->render('event/calendar.html.twig', ['event' => $event]);
     }
 
     /**
diff --git a/sources/AppBundle/Controller/Event/LeadController.php b/sources/AppBundle/Controller/Event/LeadController.php
index 94127f19d..cf94dfac9 100644
--- a/sources/AppBundle/Controller/Event/LeadController.php
+++ b/sources/AppBundle/Controller/Event/LeadController.php
@@ -69,7 +69,7 @@ public function becomeSponsor($eventSlug, Request $request)
     public function postLead($eventSlug): Response
     {
         $event = $this->eventActionHelper->getEvent($eventSlug);
-        return $this->render(':event/sponsorship_file:thanks.html.twig', ['event' => $event]);
+        return $this->render('event/sponsorship_file/thanks.html.twig', ['event' => $event]);
     }
 
     /**
diff --git a/sources/AppBundle/Controller/Event/SponsorScanController.php b/sources/AppBundle/Controller/Event/SponsorScanController.php
index 015bd24c6..09184426d 100644
--- a/sources/AppBundle/Controller/Event/SponsorScanController.php
+++ b/sources/AppBundle/Controller/Event/SponsorScanController.php
@@ -43,7 +43,7 @@ public function index(Request $request, $eventSlug)
         $scanRepository = $this->repositoryFactory->get(SponsorScanRepository::class);
         $scans = $scanRepository->getBySponsorTicket($sponsorTicket);
 
-        return $this->render(':event/sponsor:scan.html.twig', [
+        return $this->render('event/sponsor/scan.html.twig', [
             'event' => $event,
             'sponsorTicket' => $sponsorTicket,
             'scans' => $scans,
@@ -73,7 +73,7 @@ public function new(Request $request, $eventSlug)
             ]);
         }
 
-        return $this->render(':event/sponsor:scan_new.html.twig', [
+        return $this->render('event/sponsor/scan_new.html.twig', [
             'event' => $event,
             'form' => $form->createView(),
         ]);
diff --git a/sources/AppBundle/Controller/Event/TicketController.php b/sources/AppBundle/Controller/Event/TicketController.php
index 389a8ec95..17705ae7e 100644
--- a/sources/AppBundle/Controller/Event/TicketController.php
+++ b/sources/AppBundle/Controller/Event/TicketController.php
@@ -119,7 +119,7 @@ public function sponsorTicket(Request $request, $eventSlug)
             return $this->redirectToRoute('sponsor_ticket_home', ['eventSlug' => $eventSlug]);
         }
 
-        return $this->render(':event/ticket:sponsor_home.html.twig', ['event' => $event]);
+        return $this->render('event/ticket/sponsor_home.html.twig', ['event' => $event]);
     }
 
     public function sponsorTicketForm(Request $request, $eventSlug)
@@ -165,7 +165,7 @@ public function sponsorTicketForm(Request $request, $eventSlug)
             // Et qu'il n'y a plus d'invitation
             // ou que la date du sponsoring est pas passée
             if ($ticket->getId() === null && ($sponsorTicket->getPendingInvitations() <= 0 || $event->getDateEndSalesSponsorToken() < new \DateTime())) {
-                return $this->render(':event/ticket:sold_out.html.twig', ['event' => $event]);
+                return $this->render('event/ticket/sold_out.html.twig', ['event' => $event]);
             }
 
             $sponsorTicketHelper->addTicketToSponsor($sponsorTicket, $ticket);
@@ -214,7 +214,7 @@ public function ticket($eventSlug, Request $request)
         $event = $this->eventActionHelper->getEvent($eventSlug);
 
         if ($event->getDateEndSales() < new \DateTime()) {
-            return $this->render(':event/ticket:sold_out.html.twig', ['event' => $event]);
+            return $this->render('event/ticket/sold_out.html.twig', ['event' => $event]);
         }
 
         $purchaseFactory = $this->purchaseTypeFactory;
@@ -313,7 +313,7 @@ public function payment($eventSlug, Request $request): Response
             $this->logger->addWarning(
                 sprintf('Invoice %s already paid, cannot show the paymentAction', $invoiceRef)
             );
-            return $this->render(':event/ticket:payment_already_done.html.twig', ['event' => $event]);
+            return $this->render('event/ticket/payment_already_done.html.twig', ['event' => $event]);
         }
 
         $amount = $invoice->getAmount();
@@ -454,7 +454,7 @@ public function payboxRedirect($eventSlug, Request $request): Response
 
         $payboxResponse = PayboxResponseFactory::createFromRequest($request);
 
-        return $this->render(':event/ticket:paybox_redirect.html.twig', [
+        return $this->render('event/ticket/paybox_redirect.html.twig', [
             'event' => $event,
             'invoice' => $invoice,
             'payboxResponse' => $payboxResponse,
diff --git a/sources/AppBundle/Controller/Website/CompanyPublicProfileListController.php b/sources/AppBundle/Controller/Website/CompanyPublicProfileListController.php
index 6cb952d60..05bfbd411 100644
--- a/sources/AppBundle/Controller/Website/CompanyPublicProfileListController.php
+++ b/sources/AppBundle/Controller/Website/CompanyPublicProfileListController.php
@@ -37,7 +37,7 @@ public function index(): Response
             return $a <=> $b;
         });
 
-        return $this->view->render(':site:company_public_profile_list.html.twig', [
+        return $this->view->render('site/company_public_profile_list.html.twig', [
             'company_member_list' => $displayableCompanies,
         ]);
     }
diff --git a/sources/AppBundle/Controller/Website/Member/CompanyPublicProfileController.php b/sources/AppBundle/Controller/Website/Member/CompanyPublicProfileController.php
index 5a00ee5e6..f3042e9c6 100644
--- a/sources/AppBundle/Controller/Website/Member/CompanyPublicProfileController.php
+++ b/sources/AppBundle/Controller/Website/Member/CompanyPublicProfileController.php
@@ -90,7 +90,7 @@ public function index(Request $request)
         }
 
         return $this->render(
-            ':site:member/company_public_profile.html.twig',
+            'site/member/company_public_profile.html.twig',
             [
                 'form' => $form->createView(),
                 'company_member' => $companyMember,
diff --git a/sources/AppBundle/Controller/Website/PagerController.php b/sources/AppBundle/Controller/Website/PagerController.php
index 12bd1aea8..f2c71db31 100644
--- a/sources/AppBundle/Controller/Website/PagerController.php
+++ b/sources/AppBundle/Controller/Website/PagerController.php
@@ -31,7 +31,7 @@ public function display(Request $request): Response
         }
 
         return $this->render(
-            ':site:pager.html.twig',
+            'site/pager.html.twig',
             [
                 'nb_pages' => $nbPages,
                 'displayed_pages' => $displayedPages,
diff --git a/sources/AppBundle/Controller/Website/SecondaryMenuController.php b/sources/AppBundle/Controller/Website/SecondaryMenuController.php
index 28411ab2e..38b9e7ab0 100644
--- a/sources/AppBundle/Controller/Website/SecondaryMenuController.php
+++ b/sources/AppBundle/Controller/Website/SecondaryMenuController.php
@@ -23,7 +23,7 @@ public function display(Request $request): Response
         $menu = $branche->feuillesEnfants($request->get('feuille_id'));
 
         return $this->render(
-            ':site:secondary_menu.html.twig',
+            'site/secondary_menu.html.twig',
             [
                 'menu' => $this->prepareMenu($this->requestStack->getMasterRequest(), $menu),
             ]
diff --git a/sources/AppBundle/Controller/Website/StaticController.php b/sources/AppBundle/Controller/Website/StaticController.php
index f1d6218ef..f67204d9d 100644
--- a/sources/AppBundle/Controller/Website/StaticController.php
+++ b/sources/AppBundle/Controller/Website/StaticController.php
@@ -24,7 +24,7 @@ public function __construct(ViewRenderer $view, string $superAperoCsvUrl)
 
     public function offices(): Response
     {
-        return $this->view->render(':site:offices.html.twig', [
+        return $this->view->render('site/offices.html.twig', [
             'antennes' => (new AntennesCollection())->getAllSortedByLabels(),
         ]);
     }
@@ -65,7 +65,7 @@ protected function getAperos($url): array
 
     public function superApero(): Response
     {
-        return $this->view->render(':site:superapero.html.twig', [
+        return $this->view->render('site/superapero.html.twig', [
             'aperos' => $this->getAperos($this->superAperoCsvUrl),
         ]);
     }
diff --git a/sources/AppBundle/Email/Emails.php b/sources/AppBundle/Email/Emails.php
index 5bd860689..dd32d7da8 100644
--- a/sources/AppBundle/Email/Emails.php
+++ b/sources/AppBundle/Email/Emails.php
@@ -48,7 +48,7 @@ public function sendInscription(Event $event, MailUser $recipient): void
 
         $message->addAttachment($this->getAttachementIcsInscription($event, $recipient));
 
-        $this->mailer->renderTemplate($message, ':admin/event:mail_inscription.html.twig', [
+        $this->mailer->renderTemplate($message, 'admin/event/mail_inscription.html.twig', [
             'event' => $event,
             'recipient' => $recipient,
             'content' => $mailContent,
diff --git a/app/Resources/views/admin/association/membership/_base.html.twig b/templates/admin/association/membership/_base.html.twig
similarity index 96%
rename from app/Resources/views/admin/association/membership/_base.html.twig
rename to templates/admin/association/membership/_base.html.twig
index f96b525bf..3f32000da 100644
--- a/app/Resources/views/admin/association/membership/_base.html.twig
+++ b/templates/admin/association/membership/_base.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/admin/association/membership/_company_menu.html.twig b/templates/admin/association/membership/_company_menu.html.twig
similarity index 92%
rename from app/Resources/views/admin/association/membership/_company_menu.html.twig
rename to templates/admin/association/membership/_company_menu.html.twig
index 66d5b9cf9..67c04a2fd 100644
--- a/app/Resources/views/admin/association/membership/_company_menu.html.twig
+++ b/templates/admin/association/membership/_company_menu.html.twig
@@ -1,4 +1,4 @@
-{% include ':site:secondary_menu.html.twig' with {
+{% include 'site/secondary_menu.html.twig' with {
     menu: [
         {
             "nom" : "Accueil",
diff --git a/app/Resources/views/admin/association/membership/_member_menu.html.twig b/templates/admin/association/membership/_member_menu.html.twig
similarity index 93%
rename from app/Resources/views/admin/association/membership/_member_menu.html.twig
rename to templates/admin/association/membership/_member_menu.html.twig
index a78e1c0e9..646e4b4f6 100644
--- a/app/Resources/views/admin/association/membership/_member_menu.html.twig
+++ b/templates/admin/association/membership/_member_menu.html.twig
@@ -1,4 +1,4 @@
-{% include ':site:secondary_menu.html.twig' with {
+{% include 'site/secondary_menu.html.twig' with {
     menu: [
         {
             "nom" : "Accueil",
diff --git a/app/Resources/views/admin/association/membership/company.html.twig b/templates/admin/association/membership/company.html.twig
similarity index 89%
rename from app/Resources/views/admin/association/membership/company.html.twig
rename to templates/admin/association/membership/company.html.twig
index 50bea1b50..4c8c3fffc 100644
--- a/app/Resources/views/admin/association/membership/company.html.twig
+++ b/templates/admin/association/membership/company.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_company_menu.html.twig' with {
+    {% include 'admin/association/membership/_company_menu.html.twig' with {
         current: "contact"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/admin/association/membership/generalmeeting.html.twig b/templates/admin/association/membership/generalmeeting.html.twig
similarity index 98%
rename from app/Resources/views/admin/association/membership/generalmeeting.html.twig
rename to templates/admin/association/membership/generalmeeting.html.twig
index fc02b2187..a8de1edab 100644
--- a/app/Resources/views/admin/association/membership/generalmeeting.html.twig
+++ b/templates/admin/association/membership/generalmeeting.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "generalmeeting"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/admin/association/membership/generalmeeting_membersheepfee.html.twig b/templates/admin/association/membership/generalmeeting_membersheepfee.html.twig
similarity index 81%
rename from app/Resources/views/admin/association/membership/generalmeeting_membersheepfee.html.twig
rename to templates/admin/association/membership/generalmeeting_membersheepfee.html.twig
index 023ff4dc2..e9688a2da 100644
--- a/app/Resources/views/admin/association/membership/generalmeeting_membersheepfee.html.twig
+++ b/templates/admin/association/membership/generalmeeting_membersheepfee.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "generalmeeting"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/admin/association/membership/member_contact_details.html.twig b/templates/admin/association/membership/member_contact_details.html.twig
similarity index 91%
rename from app/Resources/views/admin/association/membership/member_contact_details.html.twig
rename to templates/admin/association/membership/member_contact_details.html.twig
index 541c9c5bc..31c4c39de 100644
--- a/app/Resources/views/admin/association/membership/member_contact_details.html.twig
+++ b/templates/admin/association/membership/member_contact_details.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "contact"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/admin/association/membership/members_company.html.twig b/templates/admin/association/membership/members_company.html.twig
similarity index 100%
rename from app/Resources/views/admin/association/membership/members_company.html.twig
rename to templates/admin/association/membership/members_company.html.twig
diff --git a/app/Resources/views/admin/association/membership/membershipfee.html.twig b/templates/admin/association/membership/membershipfee.html.twig
similarity index 95%
rename from app/Resources/views/admin/association/membership/membershipfee.html.twig
rename to templates/admin/association/membership/membershipfee.html.twig
index 3a8b09136..c37e49008 100644
--- a/app/Resources/views/admin/association/membership/membershipfee.html.twig
+++ b/templates/admin/association/membership/membershipfee.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "membershipfee"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/admin/association/membership/register.html.twig b/templates/admin/association/membership/register.html.twig
similarity index 95%
rename from app/Resources/views/admin/association/membership/register.html.twig
rename to templates/admin/association/membership/register.html.twig
index 94375c81f..5f5b888bd 100644
--- a/app/Resources/views/admin/association/membership/register.html.twig
+++ b/templates/admin/association/membership/register.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block page_title %}Formulaire d'inscription à l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/admin/association/membership/stats.html.twig b/templates/admin/association/membership/stats.html.twig
similarity index 100%
rename from app/Resources/views/admin/association/membership/stats.html.twig
rename to templates/admin/association/membership/stats.html.twig
diff --git a/app/Resources/views/admin/base.html.twig b/templates/admin/base.html.twig
similarity index 100%
rename from app/Resources/views/admin/base.html.twig
rename to templates/admin/base.html.twig
diff --git a/app/Resources/views/admin/base_with_header.html.twig b/templates/admin/base_with_header.html.twig
similarity index 100%
rename from app/Resources/views/admin/base_with_header.html.twig
rename to templates/admin/base_with_header.html.twig
diff --git a/app/Resources/views/admin/event/bankwires.html.twig b/templates/admin/event/bankwires.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/bankwires.html.twig
rename to templates/admin/event/bankwires.html.twig
diff --git a/app/Resources/views/admin/event/change_event.html.twig b/templates/admin/event/change_event.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/change_event.html.twig
rename to templates/admin/event/change_event.html.twig
diff --git a/app/Resources/views/admin/event/list.html.twig b/templates/admin/event/list.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/list.html.twig
rename to templates/admin/event/list.html.twig
diff --git a/app/Resources/views/admin/event/mail_inscription.html.twig b/templates/admin/event/mail_inscription.html.twig
similarity index 87%
rename from app/Resources/views/admin/event/mail_inscription.html.twig
rename to templates/admin/event/mail_inscription.html.twig
index 861c4f60c..2b60721f6 100644
--- a/app/Resources/views/admin/event/mail_inscription.html.twig
+++ b/templates/admin/event/mail_inscription.html.twig
@@ -1,4 +1,4 @@
-{% extends ':mail:_base_mail.html.twig' %}
+{% extends 'mail/_base_mail.html.twig' %}
 
 {% block content %}
 
diff --git a/app/Resources/views/admin/event/prices.html.twig b/templates/admin/event/prices.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/prices.html.twig
rename to templates/admin/event/prices.html.twig
diff --git a/app/Resources/views/admin/event/prices_add_edit.html.twig b/templates/admin/event/prices_add_edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/prices_add_edit.html.twig
rename to templates/admin/event/prices_add_edit.html.twig
diff --git a/app/Resources/views/admin/event/rooms.html.twig b/templates/admin/event/rooms.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/rooms.html.twig
rename to templates/admin/event/rooms.html.twig
diff --git a/app/Resources/views/admin/event/speakers_expenses.html.twig b/templates/admin/event/speakers_expenses.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/speakers_expenses.html.twig
rename to templates/admin/event/speakers_expenses.html.twig
diff --git a/app/Resources/views/admin/event/speakers_management.html.twig b/templates/admin/event/speakers_management.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/speakers_management.html.twig
rename to templates/admin/event/speakers_management.html.twig
diff --git a/app/Resources/views/admin/event/special_price.html.twig b/templates/admin/event/special_price.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/special_price.html.twig
rename to templates/admin/event/special_price.html.twig
diff --git a/app/Resources/views/admin/event/sponsor_ticket.html.twig b/templates/admin/event/sponsor_ticket.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/sponsor_ticket.html.twig
rename to templates/admin/event/sponsor_ticket.html.twig
diff --git a/app/Resources/views/admin/event/stats.html.twig b/templates/admin/event/stats.html.twig
similarity index 100%
rename from app/Resources/views/admin/event/stats.html.twig
rename to templates/admin/event/stats.html.twig
diff --git a/app/Resources/views/admin/github_user/add.html.twig b/templates/admin/github_user/add.html.twig
similarity index 100%
rename from app/Resources/views/admin/github_user/add.html.twig
rename to templates/admin/github_user/add.html.twig
diff --git a/app/Resources/views/admin/github_user/list.html.twig b/templates/admin/github_user/list.html.twig
similarity index 100%
rename from app/Resources/views/admin/github_user/list.html.twig
rename to templates/admin/github_user/list.html.twig
diff --git a/app/Resources/views/admin/groups/lists.html.twig b/templates/admin/groups/lists.html.twig
similarity index 93%
rename from app/Resources/views/admin/groups/lists.html.twig
rename to templates/admin/groups/lists.html.twig
index 92285de1b..069a550fe 100644
--- a/app/Resources/views/admin/groups/lists.html.twig
+++ b/templates/admin/groups/lists.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "mygroups"
     } only %}
 
diff --git a/app/Resources/views/admin/healthcheck.html.twig b/templates/admin/healthcheck.html.twig
similarity index 100%
rename from app/Resources/views/admin/healthcheck.html.twig
rename to templates/admin/healthcheck.html.twig
diff --git a/app/Resources/views/admin/home.html.twig b/templates/admin/home.html.twig
similarity index 100%
rename from app/Resources/views/admin/home.html.twig
rename to templates/admin/home.html.twig
diff --git a/app/Resources/views/admin/login.html.twig b/templates/admin/login.html.twig
similarity index 100%
rename from app/Resources/views/admin/login.html.twig
rename to templates/admin/login.html.twig
diff --git a/app/Resources/views/admin/lost_password.html.twig b/templates/admin/lost_password.html.twig
similarity index 94%
rename from app/Resources/views/admin/lost_password.html.twig
rename to templates/admin/lost_password.html.twig
index 22c8ccebd..d6640415f 100644
--- a/app/Resources/views/admin/lost_password.html.twig
+++ b/templates/admin/lost_password.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block page_title %}{% endblock %}
 
diff --git a/app/Resources/views/admin/members/badges/index.html.twig b/templates/admin/members/badges/index.html.twig
similarity index 97%
rename from app/Resources/views/admin/members/badges/index.html.twig
rename to templates/admin/members/badges/index.html.twig
index 56963bb0c..e3d2659c1 100644
--- a/app/Resources/views/admin/members/badges/index.html.twig
+++ b/templates/admin/members/badges/index.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 {% block stylesheets %}
     <link rel="stylesheet" href="{{ asset('css/forms_company.css') }}" media="all"/>
 {% endblock %}
diff --git a/app/Resources/views/admin/members/badges/new.html.twig b/templates/admin/members/badges/new.html.twig
similarity index 97%
rename from app/Resources/views/admin/members/badges/new.html.twig
rename to templates/admin/members/badges/new.html.twig
index 6ec8ffdf4..15ce45df3 100644
--- a/app/Resources/views/admin/members/badges/new.html.twig
+++ b/templates/admin/members/badges/new.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 {% block stylesheets %}
     <link rel="stylesheet" href="{{ asset('css/forms_company.css') }}" media="all"/>
     <link rel="stylesheet" href="{{ asset('css/buttons.css') }}" media="all" />
diff --git a/app/Resources/views/admin/members/general_meeting/edit.html.twig b/templates/admin/members/general_meeting/edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting/edit.html.twig
rename to templates/admin/members/general_meeting/edit.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting/list.html.twig b/templates/admin/members/general_meeting/list.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting/list.html.twig
rename to templates/admin/members/general_meeting/list.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting/prepare.html.twig b/templates/admin/members/general_meeting/prepare.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting/prepare.html.twig
rename to templates/admin/members/general_meeting/prepare.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting/reports.html.twig b/templates/admin/members/general_meeting/reports.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting/reports.html.twig
rename to templates/admin/members/general_meeting/reports.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting_question/add.html.twig b/templates/admin/members/general_meeting_question/add.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting_question/add.html.twig
rename to templates/admin/members/general_meeting_question/add.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting_question/edit.html.twig b/templates/admin/members/general_meeting_question/edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting_question/edit.html.twig
rename to templates/admin/members/general_meeting_question/edit.html.twig
diff --git a/app/Resources/views/admin/members/general_meeting_vote/list.html.twig b/templates/admin/members/general_meeting_vote/list.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/general_meeting_vote/list.html.twig
rename to templates/admin/members/general_meeting_vote/list.html.twig
diff --git a/app/Resources/views/admin/members/user_add.html.twig b/templates/admin/members/user_add.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/user_add.html.twig
rename to templates/admin/members/user_add.html.twig
diff --git a/app/Resources/views/admin/members/user_badge/user_badges.html.twig b/templates/admin/members/user_badge/user_badges.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/user_badge/user_badges.html.twig
rename to templates/admin/members/user_badge/user_badges.html.twig
diff --git a/app/Resources/views/admin/members/user_edit.html.twig b/templates/admin/members/user_edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/user_edit.html.twig
rename to templates/admin/members/user_edit.html.twig
diff --git a/app/Resources/views/admin/members/user_list.html.twig b/templates/admin/members/user_list.html.twig
similarity index 100%
rename from app/Resources/views/admin/members/user_list.html.twig
rename to templates/admin/members/user_list.html.twig
diff --git a/app/Resources/views/admin/menu.html.twig b/templates/admin/menu.html.twig
similarity index 100%
rename from app/Resources/views/admin/menu.html.twig
rename to templates/admin/menu.html.twig
diff --git a/app/Resources/views/admin/planete/feed_add.html.twig b/templates/admin/planete/feed_add.html.twig
similarity index 100%
rename from app/Resources/views/admin/planete/feed_add.html.twig
rename to templates/admin/planete/feed_add.html.twig
diff --git a/app/Resources/views/admin/planete/feed_article_list.html.twig b/templates/admin/planete/feed_article_list.html.twig
similarity index 100%
rename from app/Resources/views/admin/planete/feed_article_list.html.twig
rename to templates/admin/planete/feed_article_list.html.twig
diff --git a/app/Resources/views/admin/planete/feed_edit.html.twig b/templates/admin/planete/feed_edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/planete/feed_edit.html.twig
rename to templates/admin/planete/feed_edit.html.twig
diff --git a/app/Resources/views/admin/planete/feed_list.html.twig b/templates/admin/planete/feed_list.html.twig
similarity index 100%
rename from app/Resources/views/admin/planete/feed_list.html.twig
rename to templates/admin/planete/feed_list.html.twig
diff --git a/app/Resources/views/admin/relances/liste.html.twig b/templates/admin/relances/liste.html.twig
similarity index 98%
rename from app/Resources/views/admin/relances/liste.html.twig
rename to templates/admin/relances/liste.html.twig
index 61824c3a7..a93bea59b 100644
--- a/app/Resources/views/admin/relances/liste.html.twig
+++ b/templates/admin/relances/liste.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
     <h2>Relance des cotisations</h2>
diff --git a/app/Resources/views/admin/site/rubrique_form.html.twig b/templates/admin/site/rubrique_form.html.twig
similarity index 100%
rename from app/Resources/views/admin/site/rubrique_form.html.twig
rename to templates/admin/site/rubrique_form.html.twig
diff --git a/app/Resources/views/admin/site/rubrique_list.html.twig b/templates/admin/site/rubrique_list.html.twig
similarity index 100%
rename from app/Resources/views/admin/site/rubrique_list.html.twig
rename to templates/admin/site/rubrique_list.html.twig
diff --git a/app/Resources/views/admin/slackmembers/index.html.twig b/templates/admin/slackmembers/index.html.twig
similarity index 100%
rename from app/Resources/views/admin/slackmembers/index.html.twig
rename to templates/admin/slackmembers/index.html.twig
diff --git a/app/Resources/views/admin/speaker/add.html.twig b/templates/admin/speaker/add.html.twig
similarity index 100%
rename from app/Resources/views/admin/speaker/add.html.twig
rename to templates/admin/speaker/add.html.twig
diff --git a/app/Resources/views/admin/speaker/edit.html.twig b/templates/admin/speaker/edit.html.twig
similarity index 100%
rename from app/Resources/views/admin/speaker/edit.html.twig
rename to templates/admin/speaker/edit.html.twig
diff --git a/app/Resources/views/admin/speaker/list.html.twig b/templates/admin/speaker/list.html.twig
similarity index 100%
rename from app/Resources/views/admin/speaker/list.html.twig
rename to templates/admin/speaker/list.html.twig
diff --git a/app/Resources/views/admin/techletter/generate.html.twig b/templates/admin/techletter/generate.html.twig
similarity index 98%
rename from app/Resources/views/admin/techletter/generate.html.twig
rename to templates/admin/techletter/generate.html.twig
index fa03c272f..1fa2f501c 100644
--- a/app/Resources/views/admin/techletter/generate.html.twig
+++ b/templates/admin/techletter/generate.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
     <h2>Veille de l'AFUP du {{ sending.sendingDate|date("d/m/Y") }}</h2>
diff --git a/app/Resources/views/admin/techletter/history.html.twig b/templates/admin/techletter/history.html.twig
similarity index 94%
rename from app/Resources/views/admin/techletter/history.html.twig
rename to templates/admin/techletter/history.html.twig
index eaec50d44..464b1608a 100644
--- a/app/Resources/views/admin/techletter/history.html.twig
+++ b/templates/admin/techletter/history.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
     <h2>Historique</h2>
diff --git a/app/Resources/views/admin/techletter/index.html.twig b/templates/admin/techletter/index.html.twig
similarity index 97%
rename from app/Resources/views/admin/techletter/index.html.twig
rename to templates/admin/techletter/index.html.twig
index 881f5dc85..328d7c4d9 100644
--- a/app/Resources/views/admin/techletter/index.html.twig
+++ b/templates/admin/techletter/index.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
 
diff --git a/app/Resources/views/admin/techletter/mail_template.html.twig b/templates/admin/techletter/mail_template.html.twig
similarity index 100%
rename from app/Resources/views/admin/techletter/mail_template.html.twig
rename to templates/admin/techletter/mail_template.html.twig
diff --git a/app/Resources/views/admin/techletter/members.html.twig b/templates/admin/techletter/members.html.twig
similarity index 94%
rename from app/Resources/views/admin/techletter/members.html.twig
rename to templates/admin/techletter/members.html.twig
index 9c1d39a0e..8e30bb452 100644
--- a/app/Resources/views/admin/techletter/members.html.twig
+++ b/templates/admin/techletter/members.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin:base_with_header.html.twig' %}
+{% extends 'admin/base_with_header.html.twig' %}
 
 {% block content %}
     <h2>Abonnés</h2>
diff --git a/app/Resources/views/admin/vote/liste.html.twig b/templates/admin/vote/liste.html.twig
similarity index 100%
rename from app/Resources/views/admin/vote/liste.html.twig
rename to templates/admin/vote/liste.html.twig
diff --git a/app/Resources/views/base.html.twig b/templates/base.html.twig
similarity index 100%
rename from app/Resources/views/base.html.twig
rename to templates/base.html.twig
diff --git a/app/Resources/views/blog/planning.html.twig b/templates/blog/planning.html.twig
similarity index 100%
rename from app/Resources/views/blog/planning.html.twig
rename to templates/blog/planning.html.twig
diff --git a/app/Resources/views/blog/program.html.twig b/templates/blog/program.html.twig
similarity index 100%
rename from app/Resources/views/blog/program.html.twig
rename to templates/blog/program.html.twig
diff --git a/app/Resources/views/blog/speakers.html.twig b/templates/blog/speakers.html.twig
similarity index 100%
rename from app/Resources/views/blog/speakers.html.twig
rename to templates/blog/speakers.html.twig
diff --git a/app/Resources/views/blog/talk.html.twig b/templates/blog/talk.html.twig
similarity index 100%
rename from app/Resources/views/blog/talk.html.twig
rename to templates/blog/talk.html.twig
diff --git a/app/Resources/TwigBundle/views/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig
similarity index 91%
rename from app/Resources/TwigBundle/views/Exception/error404.html.twig
rename to templates/bundles/TwigBundle/Exception/error404.html.twig
index 9e70c106c..4c03b2a65 100644
--- a/app/Resources/TwigBundle/views/Exception/error404.html.twig
+++ b/templates/bundles/TwigBundle/Exception/error404.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Page 404{% endblock %}
 
diff --git a/app/Resources/views/common/star.html.twig b/templates/common/star.html.twig
similarity index 100%
rename from app/Resources/views/common/star.html.twig
rename to templates/common/star.html.twig
diff --git a/app/Resources/views/event/base.html.twig b/templates/event/base.html.twig
similarity index 93%
rename from app/Resources/views/event/base.html.twig
rename to templates/event/base.html.twig
index bb8613e09..a30b33d7b 100644
--- a/app/Resources/views/event/base.html.twig
+++ b/templates/event/base.html.twig
@@ -1,4 +1,4 @@
-{% extends '::base.html.twig' %}
+{% extends 'base.html.twig' %}
 
 {% block title %}Call For Papers - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/calendar.html.twig b/templates/event/calendar.html.twig
similarity index 100%
rename from app/Resources/views/event/calendar.html.twig
rename to templates/event/calendar.html.twig
diff --git a/app/Resources/views/event/cfp/base.html.twig b/templates/event/cfp/base.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/base.html.twig
rename to templates/event/cfp/base.html.twig
diff --git a/app/Resources/views/event/cfp/closed.html.twig b/templates/event/cfp/closed.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/closed.html.twig
rename to templates/event/cfp/closed.html.twig
diff --git a/app/Resources/views/event/cfp/edit.html.twig b/templates/event/cfp/edit.html.twig
similarity index 98%
rename from app/Resources/views/event/cfp/edit.html.twig
rename to templates/event/cfp/edit.html.twig
index 5f5643d92..85c91e09a 100644
--- a/app/Resources/views/event/cfp/edit.html.twig
+++ b/templates/event/cfp/edit.html.twig
@@ -31,7 +31,7 @@
         {% if votes.count > 0 %}
             <h3>{{ 'Votes'|trans }} ({{ votes.count }})</h3>
             <p>{{ "Retrouvez ici les votes déposés sur cette proposition. Ils peuvent vous aider à l'améliorer si nécessaire."|trans }}</p>
-            {% include ':common:star.html.twig' %}
+            {% include 'common/star.html.twig' %}
             <div class="cfp--votes">
                 <ul>
                     {% for vote in votes %}
diff --git a/app/Resources/views/event/cfp/home.html.twig b/templates/event/cfp/home.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/home.html.twig
rename to templates/event/cfp/home.html.twig
diff --git a/app/Resources/views/event/cfp/propose.html.twig b/templates/event/cfp/propose.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/propose.html.twig
rename to templates/event/cfp/propose.html.twig
diff --git a/app/Resources/views/event/cfp/sidebar.html.twig b/templates/event/cfp/sidebar.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/sidebar.html.twig
rename to templates/event/cfp/sidebar.html.twig
diff --git a/app/Resources/views/event/cfp/speaker.html.twig b/templates/event/cfp/speaker.html.twig
similarity index 100%
rename from app/Resources/views/event/cfp/speaker.html.twig
rename to templates/event/cfp/speaker.html.twig
diff --git a/app/Resources/views/event/cfp/vote_only.html.twig b/templates/event/cfp/vote_only.html.twig
similarity index 98%
rename from app/Resources/views/event/cfp/vote_only.html.twig
rename to templates/event/cfp/vote_only.html.twig
index a4f4412dc..1cae252b1 100644
--- a/app/Resources/views/event/cfp/vote_only.html.twig
+++ b/templates/event/cfp/vote_only.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block javascripts %}
     {{ parent() }}
diff --git a/app/Resources/views/event/home.html.twig b/templates/event/home.html.twig
similarity index 99%
rename from app/Resources/views/event/home.html.twig
rename to templates/event/home.html.twig
index 4ab5fa1ca..68a9bc063 100644
--- a/app/Resources/views/event/home.html.twig
+++ b/templates/event/home.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block javascripts %}
     {{ parent() }}
diff --git a/app/Resources/views/event/menu.html.twig b/templates/event/menu.html.twig
similarity index 100%
rename from app/Resources/views/event/menu.html.twig
rename to templates/event/menu.html.twig
diff --git a/app/Resources/views/event/none.html.twig b/templates/event/none.html.twig
similarity index 77%
rename from app/Resources/views/event/none.html.twig
rename to templates/event/none.html.twig
index 994a7c08a..9db39081f 100644
--- a/app/Resources/views/event/none.html.twig
+++ b/templates/event/none.html.twig
@@ -1,4 +1,4 @@
-{% extends '::base.html.twig' %}
+{% extends 'base.html.twig' %}
 
 {% block body %}
     <h2>{{ 'Aucun évènement en préparation ! Revenez bientot !'|trans }}</h2>
diff --git a/app/Resources/views/event/speaker-suggestion/closed.html.twig b/templates/event/speaker-suggestion/closed.html.twig
similarity index 83%
rename from app/Resources/views/event/speaker-suggestion/closed.html.twig
rename to templates/event/speaker-suggestion/closed.html.twig
index 227407f21..321591f21 100644
--- a/app/Resources/views/event/speaker-suggestion/closed.html.twig
+++ b/templates/event/speaker-suggestion/closed.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block content %}
     <div class="col-md-12">
diff --git a/app/Resources/views/event/speaker-suggestion/index.html.twig b/templates/event/speaker-suggestion/index.html.twig
similarity index 98%
rename from app/Resources/views/event/speaker-suggestion/index.html.twig
rename to templates/event/speaker-suggestion/index.html.twig
index 9c5c12732..8668a530b 100644
--- a/app/Resources/views/event/speaker-suggestion/index.html.twig
+++ b/templates/event/speaker-suggestion/index.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block content %}
 
diff --git a/app/Resources/views/event/speaker-suggestion/mail.txt.twig b/templates/event/speaker-suggestion/mail.txt.twig
similarity index 100%
rename from app/Resources/views/event/speaker-suggestion/mail.txt.twig
rename to templates/event/speaker-suggestion/mail.txt.twig
diff --git a/app/Resources/views/event/speaker/page.html.twig b/templates/event/speaker/page.html.twig
similarity index 99%
rename from app/Resources/views/event/speaker/page.html.twig
rename to templates/event/speaker/page.html.twig
index 6e9ded820..f6b5002a7 100644
--- a/app/Resources/views/event/speaker/page.html.twig
+++ b/templates/event/speaker/page.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block header %}
     {% set menu = {'main': {'route' : 'event', 'title': 'Ma page speaker : %title%'|trans({'%title%': event.title}) }, 'items': []} %}
diff --git a/app/Resources/views/event/sponsor/base.html.twig b/templates/event/sponsor/base.html.twig
similarity index 89%
rename from app/Resources/views/event/sponsor/base.html.twig
rename to templates/event/sponsor/base.html.twig
index b03c29bc0..571798a50 100644
--- a/app/Resources/views/event/sponsor/base.html.twig
+++ b/templates/event/sponsor/base.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block title %}{{ 'Espace sponsor'|trans }} - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/sponsor/scan.html.twig b/templates/event/sponsor/scan.html.twig
similarity index 97%
rename from app/Resources/views/event/sponsor/scan.html.twig
rename to templates/event/sponsor/scan.html.twig
index c1b410100..3c4face95 100644
--- a/app/Resources/views/event/sponsor/scan.html.twig
+++ b/templates/event/sponsor/scan.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/sponsor:base.html.twig' %}
+{% extends 'event/sponsor/base.html.twig' %}
 
 {% block content %}
     <div class="row">
diff --git a/app/Resources/views/event/sponsor/scan_new.html.twig b/templates/event/sponsor/scan_new.html.twig
similarity index 95%
rename from app/Resources/views/event/sponsor/scan_new.html.twig
rename to templates/event/sponsor/scan_new.html.twig
index a3b0480ed..8d551db96 100644
--- a/app/Resources/views/event/sponsor/scan_new.html.twig
+++ b/templates/event/sponsor/scan_new.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/sponsor:base.html.twig' %}
+{% extends 'event/sponsor/base.html.twig' %}
 
 {% block title %}{{ 'Scanner un QR Code'|trans }} - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/sponsorship_file/base.html.twig b/templates/event/sponsorship_file/base.html.twig
similarity index 84%
rename from app/Resources/views/event/sponsorship_file/base.html.twig
rename to templates/event/sponsorship_file/base.html.twig
index 67dfe38fd..fdae76536 100644
--- a/app/Resources/views/event/sponsorship_file/base.html.twig
+++ b/templates/event/sponsorship_file/base.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block title %}{{ 'Dossier sponsor'|trans }} - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/sponsorship_file/form.html.twig b/templates/event/sponsorship_file/form.html.twig
similarity index 96%
rename from app/Resources/views/event/sponsorship_file/form.html.twig
rename to templates/event/sponsorship_file/form.html.twig
index 6cf979e62..895d26117 100644
--- a/app/Resources/views/event/sponsorship_file/form.html.twig
+++ b/templates/event/sponsorship_file/form.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% block title %}{{ 'Become a sponsor'|trans }} - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/sponsorship_file/thanks.html.twig b/templates/event/sponsorship_file/thanks.html.twig
similarity index 92%
rename from app/Resources/views/event/sponsorship_file/thanks.html.twig
rename to templates/event/sponsorship_file/thanks.html.twig
index 6e09f1dd5..25ff757aa 100644
--- a/app/Resources/views/event/sponsorship_file/thanks.html.twig
+++ b/templates/event/sponsorship_file/thanks.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% set menu = {'main': {'route' : 'ticket', 'title': 'Become a sponsor'}} %}
 
diff --git a/app/Resources/views/event/switch.html.twig b/templates/event/switch.html.twig
similarity index 93%
rename from app/Resources/views/event/switch.html.twig
rename to templates/event/switch.html.twig
index 401e75b3a..baa561948 100644
--- a/app/Resources/views/event/switch.html.twig
+++ b/templates/event/switch.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block metas %}
     {{ parent() }}
diff --git a/app/Resources/views/event/ticket/base.html.twig b/templates/event/ticket/base.html.twig
similarity index 84%
rename from app/Resources/views/event/ticket/base.html.twig
rename to templates/event/ticket/base.html.twig
index 7d471f5ba..0023adca4 100644
--- a/app/Resources/views/event/ticket/base.html.twig
+++ b/templates/event/ticket/base.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event:base.html.twig' %}
+{% extends 'event/base.html.twig' %}
 
 {% block title %}{{ 'Billetterie'|trans }} - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/ticket/paybox_redirect.html.twig b/templates/event/ticket/paybox_redirect.html.twig
similarity index 95%
rename from app/Resources/views/event/ticket/paybox_redirect.html.twig
rename to templates/event/ticket/paybox_redirect.html.twig
index a8b3ef5e1..b9be6b0cf 100644
--- a/app/Resources/views/event/ticket/paybox_redirect.html.twig
+++ b/templates/event/ticket/paybox_redirect.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% set menu = {'main': {'route' : 'ticket', 'title': 'Billetterie'}} %}
 
diff --git a/app/Resources/views/event/ticket/payment.html.twig b/templates/event/ticket/payment.html.twig
similarity index 99%
rename from app/Resources/views/event/ticket/payment.html.twig
rename to templates/event/ticket/payment.html.twig
index 70ff2b28a..d24804f8e 100644
--- a/app/Resources/views/event/ticket/payment.html.twig
+++ b/templates/event/ticket/payment.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% set menu = {'main': {'route' : 'ticket', 'title': 'Billetterie'}} %}
 
diff --git a/app/Resources/views/event/ticket/payment_already_done.html.twig b/templates/event/ticket/payment_already_done.html.twig
similarity index 90%
rename from app/Resources/views/event/ticket/payment_already_done.html.twig
rename to templates/event/ticket/payment_already_done.html.twig
index 697c5f241..5acb519b0 100644
--- a/app/Resources/views/event/ticket/payment_already_done.html.twig
+++ b/templates/event/ticket/payment_already_done.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% set menu = {'main': {'route' : 'ticket', 'title': 'Billetterie'}} %}
 
diff --git a/app/Resources/views/event/ticket/sold_out.html.twig b/templates/event/ticket/sold_out.html.twig
similarity index 90%
rename from app/Resources/views/event/ticket/sold_out.html.twig
rename to templates/event/ticket/sold_out.html.twig
index 60221d80c..d6f41fd14 100644
--- a/app/Resources/views/event/ticket/sold_out.html.twig
+++ b/templates/event/ticket/sold_out.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% block title %}Billetterie sponsors - Afup{% endblock %}
 
diff --git a/app/Resources/views/event/ticket/sponsor.html.twig b/templates/event/ticket/sponsor.html.twig
similarity index 99%
rename from app/Resources/views/event/ticket/sponsor.html.twig
rename to templates/event/ticket/sponsor.html.twig
index 7368490cf..c767156f6 100644
--- a/app/Resources/views/event/ticket/sponsor.html.twig
+++ b/templates/event/ticket/sponsor.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/event/ticket/sponsor_home.html.twig b/templates/event/ticket/sponsor_home.html.twig
similarity index 93%
rename from app/Resources/views/event/ticket/sponsor_home.html.twig
rename to templates/event/ticket/sponsor_home.html.twig
index 8960c83c4..4f3e37b09 100644
--- a/app/Resources/views/event/ticket/sponsor_home.html.twig
+++ b/templates/event/ticket/sponsor_home.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% block metas %}
     {{ parent() }}
diff --git a/app/Resources/views/event/ticket/ticket.html.twig b/templates/event/ticket/ticket.html.twig
similarity index 99%
rename from app/Resources/views/event/ticket/ticket.html.twig
rename to templates/event/ticket/ticket.html.twig
index e22076ead..4f5f323b3 100644
--- a/app/Resources/views/event/ticket/ticket.html.twig
+++ b/templates/event/ticket/ticket.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/ticket:base.html.twig' %}
+{% extends 'event/ticket/base.html.twig' %}
 
 {% set menu = {'main': {'route' : 'ticket', 'title': 'Billetterie'}} %}
 
diff --git a/app/Resources/views/event/vote/liste.html.twig b/templates/event/vote/liste.html.twig
similarity index 92%
rename from app/Resources/views/event/vote/liste.html.twig
rename to templates/event/vote/liste.html.twig
index e89267a0d..7643993c6 100644
--- a/app/Resources/views/event/vote/liste.html.twig
+++ b/templates/event/vote/liste.html.twig
@@ -1,4 +1,4 @@
-{% extends ':event/cfp:base.html.twig' %}
+{% extends 'event/cfp/base.html.twig' %}
 
 {% block content %}
 
@@ -9,7 +9,7 @@
         {% if numberOfTalks == 0 %}
             <p>{{ 'Il n\'y a plus aucune conférence à noter !'|trans }}</p>
         {% else %}
-            {% include ':common:star.html.twig' %}
+            {% include 'common/star.html.twig' %}
 
             {% for talk in talks|slice(0, 10) %}
                 {% include 'event/vote/talk.html.twig' %}
@@ -31,5 +31,5 @@
             </div>
         {% endif %}
     </div>
-    {% include ':event/vote:sidebar.html.twig' %}
+    {% include 'event/vote/sidebar.html.twig' %}
 {% endblock %}
diff --git a/app/Resources/views/event/vote/sidebar.html.twig b/templates/event/vote/sidebar.html.twig
similarity index 100%
rename from app/Resources/views/event/vote/sidebar.html.twig
rename to templates/event/vote/sidebar.html.twig
diff --git a/app/Resources/views/event/vote/talk.html.twig b/templates/event/vote/talk.html.twig
similarity index 100%
rename from app/Resources/views/event/vote/talk.html.twig
rename to templates/event/vote/talk.html.twig
diff --git a/app/Resources/views/form_theme.html.twig b/templates/form_theme.html.twig
similarity index 100%
rename from app/Resources/views/form_theme.html.twig
rename to templates/form_theme.html.twig
diff --git a/app/Resources/views/form_theme_admin.html.twig b/templates/form_theme_admin.html.twig
similarity index 100%
rename from app/Resources/views/form_theme_admin.html.twig
rename to templates/form_theme_admin.html.twig
diff --git a/app/Resources/views/google_analytics.html.twig b/templates/google_analytics.html.twig
similarity index 100%
rename from app/Resources/views/google_analytics.html.twig
rename to templates/google_analytics.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/acces.html.twig b/templates/legacy/forumphp2005/acces.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/acces.html.twig
rename to templates/legacy/forumphp2005/acces.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/acces2.html.twig b/templates/legacy/forumphp2005/acces2.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/acces2.html.twig
rename to templates/legacy/forumphp2005/acces2.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/annonce.html.twig b/templates/legacy/forumphp2005/annonce.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/annonce.html.twig
rename to templates/legacy/forumphp2005/annonce.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/conferenciers.html.twig b/templates/legacy/forumphp2005/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/conferenciers.html.twig
rename to templates/legacy/forumphp2005/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/contact.html.twig b/templates/legacy/forumphp2005/contact.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/contact.html.twig
rename to templates/legacy/forumphp2005/contact.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/credits.html.twig b/templates/legacy/forumphp2005/credits.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/credits.html.twig
rename to templates/legacy/forumphp2005/credits.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/english.html.twig b/templates/legacy/forumphp2005/english.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/english.html.twig
rename to templates/legacy/forumphp2005/english.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/entete.html.twig b/templates/legacy/forumphp2005/entete.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/entete.html.twig
rename to templates/legacy/forumphp2005/entete.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/index.html.twig b/templates/legacy/forumphp2005/index.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/index.html.twig
rename to templates/legacy/forumphp2005/index.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/inscription.html.twig b/templates/legacy/forumphp2005/inscription.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/inscription.html.twig
rename to templates/legacy/forumphp2005/inscription.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/liste_personnes.html.twig b/templates/legacy/forumphp2005/liste_personnes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/liste_personnes.html.twig
rename to templates/legacy/forumphp2005/liste_personnes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/pied_de_page.html.twig b/templates/legacy/forumphp2005/pied_de_page.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/pied_de_page.html.twig
rename to templates/legacy/forumphp2005/pied_de_page.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/pied_de_page_english.html.twig b/templates/legacy/forumphp2005/pied_de_page_english.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/pied_de_page_english.html.twig
rename to templates/legacy/forumphp2005/pied_de_page_english.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/resumes.html.twig b/templates/legacy/forumphp2005/resumes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/resumes.html.twig
rename to templates/legacy/forumphp2005/resumes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/sessions.html.twig b/templates/legacy/forumphp2005/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/sessions.html.twig
rename to templates/legacy/forumphp2005/sessions.html.twig
diff --git a/app/Resources/views/legacy/forumphp2005/sponsors.html.twig b/templates/legacy/forumphp2005/sponsors.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2005/sponsors.html.twig
rename to templates/legacy/forumphp2005/sponsors.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/acces.html.twig b/templates/legacy/forumphp2006/acces.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/acces.html.twig
rename to templates/legacy/forumphp2006/acces.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/acces2.html.twig b/templates/legacy/forumphp2006/acces2.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/acces2.html.twig
rename to templates/legacy/forumphp2006/acces2.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/conferenciers.html.twig b/templates/legacy/forumphp2006/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/conferenciers.html.twig
rename to templates/legacy/forumphp2006/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/contact.html.twig b/templates/legacy/forumphp2006/contact.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/contact.html.twig
rename to templates/legacy/forumphp2006/contact.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/entete.html.twig b/templates/legacy/forumphp2006/entete.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/entete.html.twig
rename to templates/legacy/forumphp2006/entete.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/index.html.twig b/templates/legacy/forumphp2006/index.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/index.html.twig
rename to templates/legacy/forumphp2006/index.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/inscription.html.twig b/templates/legacy/forumphp2006/inscription.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/inscription.html.twig
rename to templates/legacy/forumphp2006/inscription.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/pied_de_page.html.twig b/templates/legacy/forumphp2006/pied_de_page.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/pied_de_page.html.twig
rename to templates/legacy/forumphp2006/pied_de_page.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/resumes.html.twig b/templates/legacy/forumphp2006/resumes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/resumes.html.twig
rename to templates/legacy/forumphp2006/resumes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2006/sessions.html.twig b/templates/legacy/forumphp2006/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2006/sessions.html.twig
rename to templates/legacy/forumphp2006/sessions.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/acces.html.twig b/templates/legacy/forumphp2007/acces.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/acces.html.twig
rename to templates/legacy/forumphp2007/acces.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/acces2.html.twig b/templates/legacy/forumphp2007/acces2.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/acces2.html.twig
rename to templates/legacy/forumphp2007/acces2.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/conferenciers.html.twig b/templates/legacy/forumphp2007/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/conferenciers.html.twig
rename to templates/legacy/forumphp2007/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/contact.html.twig b/templates/legacy/forumphp2007/contact.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/contact.html.twig
rename to templates/legacy/forumphp2007/contact.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/entete.html.twig b/templates/legacy/forumphp2007/entete.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/entete.html.twig
rename to templates/legacy/forumphp2007/entete.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/index.html.twig b/templates/legacy/forumphp2007/index.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/index.html.twig
rename to templates/legacy/forumphp2007/index.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/inscription.html.twig b/templates/legacy/forumphp2007/inscription.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/inscription.html.twig
rename to templates/legacy/forumphp2007/inscription.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/liste_personnes.html.twig b/templates/legacy/forumphp2007/liste_personnes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/liste_personnes.html.twig
rename to templates/legacy/forumphp2007/liste_personnes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/pied_de_page.html.twig b/templates/legacy/forumphp2007/pied_de_page.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/pied_de_page.html.twig
rename to templates/legacy/forumphp2007/pied_de_page.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/rappel.html.twig b/templates/legacy/forumphp2007/rappel.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/rappel.html.twig
rename to templates/legacy/forumphp2007/rappel.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/resumes.html.twig b/templates/legacy/forumphp2007/resumes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/resumes.html.twig
rename to templates/legacy/forumphp2007/resumes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/sessions.html.twig b/templates/legacy/forumphp2007/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/sessions.html.twig
rename to templates/legacy/forumphp2007/sessions.html.twig
diff --git a/app/Resources/views/legacy/forumphp2007/sponsors.html.twig b/templates/legacy/forumphp2007/sponsors.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2007/sponsors.html.twig
rename to templates/legacy/forumphp2007/sponsors.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/acces.html.twig b/templates/legacy/forumphp2008/acces.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/acces.html.twig
rename to templates/legacy/forumphp2008/acces.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/acces2.html.twig b/templates/legacy/forumphp2008/acces2.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/acces2.html.twig
rename to templates/legacy/forumphp2008/acces2.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/cartouche.html.twig b/templates/legacy/forumphp2008/cartouche.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/cartouche.html.twig
rename to templates/legacy/forumphp2008/cartouche.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/conferenciers.html.twig b/templates/legacy/forumphp2008/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/conferenciers.html.twig
rename to templates/legacy/forumphp2008/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/entete.html.twig b/templates/legacy/forumphp2008/entete.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/entete.html.twig
rename to templates/legacy/forumphp2008/entete.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/index.html.twig b/templates/legacy/forumphp2008/index.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/index.html.twig
rename to templates/legacy/forumphp2008/index.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/inscription.html.twig b/templates/legacy/forumphp2008/inscription.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/inscription.html.twig
rename to templates/legacy/forumphp2008/inscription.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/liste_personnes.html.twig b/templates/legacy/forumphp2008/liste_personnes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/liste_personnes.html.twig
rename to templates/legacy/forumphp2008/liste_personnes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/pied_de_page.html.twig b/templates/legacy/forumphp2008/pied_de_page.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/pied_de_page.html.twig
rename to templates/legacy/forumphp2008/pied_de_page.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/rappel.html.twig b/templates/legacy/forumphp2008/rappel.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/rappel.html.twig
rename to templates/legacy/forumphp2008/rappel.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/resumes.html.twig b/templates/legacy/forumphp2008/resumes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/resumes.html.twig
rename to templates/legacy/forumphp2008/resumes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/sessions.html.twig b/templates/legacy/forumphp2008/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/sessions.html.twig
rename to templates/legacy/forumphp2008/sessions.html.twig
diff --git a/app/Resources/views/legacy/forumphp2008/sponsors.html.twig b/templates/legacy/forumphp2008/sponsors.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2008/sponsors.html.twig
rename to templates/legacy/forumphp2008/sponsors.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/acces.html.twig b/templates/legacy/forumphp2009/acces.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/acces.html.twig
rename to templates/legacy/forumphp2009/acces.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/acces_plan.html.twig b/templates/legacy/forumphp2009/acces_plan.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/acces_plan.html.twig
rename to templates/legacy/forumphp2009/acces_plan.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/agenda.html.twig b/templates/legacy/forumphp2009/agenda.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/agenda.html.twig
rename to templates/legacy/forumphp2009/agenda.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/appel-a-conferenciers.html.twig b/templates/legacy/forumphp2009/appel-a-conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/appel-a-conferenciers.html.twig
rename to templates/legacy/forumphp2009/appel-a-conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/base.twig b/templates/legacy/forumphp2009/base.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/base.twig
rename to templates/legacy/forumphp2009/base.twig
diff --git a/app/Resources/views/legacy/forumphp2009/buzz.html.twig b/templates/legacy/forumphp2009/buzz.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/buzz.html.twig
rename to templates/legacy/forumphp2009/buzz.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/cartouche.html.twig b/templates/legacy/forumphp2009/cartouche.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/cartouche.html.twig
rename to templates/legacy/forumphp2009/cartouche.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/conferenciers.html.twig b/templates/legacy/forumphp2009/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/conferenciers.html.twig
rename to templates/legacy/forumphp2009/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/contact.html.twig b/templates/legacy/forumphp2009/contact.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/contact.html.twig
rename to templates/legacy/forumphp2009/contact.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/entete.html.twig b/templates/legacy/forumphp2009/entete.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/entete.html.twig
rename to templates/legacy/forumphp2009/entete.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/index.html.twig b/templates/legacy/forumphp2009/index.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/index.html.twig
rename to templates/legacy/forumphp2009/index.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/inscription.html.twig b/templates/legacy/forumphp2009/inscription.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/inscription.html.twig
rename to templates/legacy/forumphp2009/inscription.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/liste_personnes.html.twig b/templates/legacy/forumphp2009/liste_personnes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/liste_personnes.html.twig
rename to templates/legacy/forumphp2009/liste_personnes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/liste_personnes_col_gauche.html.twig b/templates/legacy/forumphp2009/liste_personnes_col_gauche.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/liste_personnes_col_gauche.html.twig
rename to templates/legacy/forumphp2009/liste_personnes_col_gauche.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/pied_de_page.html.twig b/templates/legacy/forumphp2009/pied_de_page.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/pied_de_page.html.twig
rename to templates/legacy/forumphp2009/pied_de_page.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/projets-php.html.twig b/templates/legacy/forumphp2009/projets-php.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/projets-php.html.twig
rename to templates/legacy/forumphp2009/projets-php.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/rappel.html.twig b/templates/legacy/forumphp2009/rappel.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/rappel.html.twig
rename to templates/legacy/forumphp2009/rappel.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/resumes.html.twig b/templates/legacy/forumphp2009/resumes.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/resumes.html.twig
rename to templates/legacy/forumphp2009/resumes.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/sessions.html.twig b/templates/legacy/forumphp2009/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/sessions.html.twig
rename to templates/legacy/forumphp2009/sessions.html.twig
diff --git a/app/Resources/views/legacy/forumphp2009/sponsors.html.twig b/templates/legacy/forumphp2009/sponsors.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2009/sponsors.html.twig
rename to templates/legacy/forumphp2009/sponsors.html.twig
diff --git a/app/Resources/views/legacy/forumphp2016/conferenciers.html.twig b/templates/legacy/forumphp2016/conferenciers.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2016/conferenciers.html.twig
rename to templates/legacy/forumphp2016/conferenciers.html.twig
diff --git a/app/Resources/views/legacy/forumphp2016/planning.html.twig b/templates/legacy/forumphp2016/planning.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2016/planning.html.twig
rename to templates/legacy/forumphp2016/planning.html.twig
diff --git a/app/Resources/views/legacy/forumphp2016/sessions.html.twig b/templates/legacy/forumphp2016/sessions.html.twig
similarity index 100%
rename from app/Resources/views/legacy/forumphp2016/sessions.html.twig
rename to templates/legacy/forumphp2016/sessions.html.twig
diff --git a/app/Resources/views/mail/_base_mail.html.twig b/templates/mail/_base_mail.html.twig
similarity index 100%
rename from app/Resources/views/mail/_base_mail.html.twig
rename to templates/mail/_base_mail.html.twig
diff --git a/app/Resources/views/mail_templates/confirmation_creation_compte.html.twig b/templates/mail_templates/confirmation_creation_compte.html.twig
similarity index 100%
rename from app/Resources/views/mail_templates/confirmation_creation_compte.html.twig
rename to templates/mail_templates/confirmation_creation_compte.html.twig
diff --git a/app/Resources/views/mail_templates/facture-forum.html.twig b/templates/mail_templates/facture-forum.html.twig
similarity index 100%
rename from app/Resources/views/mail_templates/facture-forum.html.twig
rename to templates/mail_templates/facture-forum.html.twig
diff --git a/app/Resources/views/mail_templates/message-transactionnel.html.twig b/templates/mail_templates/message-transactionnel.html.twig
similarity index 100%
rename from app/Resources/views/mail_templates/message-transactionnel.html.twig
rename to templates/mail_templates/message-transactionnel.html.twig
diff --git a/app/Resources/views/mail_templates/message.html.twig b/templates/mail_templates/message.html.twig
similarity index 100%
rename from app/Resources/views/mail_templates/message.html.twig
rename to templates/mail_templates/message.html.twig
diff --git a/app/Resources/views/site/_members_menu.html.twig b/templates/site/_members_menu.html.twig
similarity index 78%
rename from app/Resources/views/site/_members_menu.html.twig
rename to templates/site/_members_menu.html.twig
index b641a3d85..13987074b 100644
--- a/app/Resources/views/site/_members_menu.html.twig
+++ b/templates/site/_members_menu.html.twig
@@ -1,4 +1,4 @@
-{% include ':site:secondary_menu.html.twig' with {
+{% include 'site/secondary_menu.html.twig' with {
     menu: [
         {
             "nom" : "Entreprises",
diff --git a/app/Resources/views/site/base.html.twig b/templates/site/base.html.twig
similarity index 99%
rename from app/Resources/views/site/base.html.twig
rename to templates/site/base.html.twig
index 2bdadb03c..5b76a7d3c 100644
--- a/app/Resources/views/site/base.html.twig
+++ b/templates/site/base.html.twig
@@ -1,4 +1,4 @@
-{% extends '::base.html.twig' %}
+{% extends 'base.html.twig' %}
 
 {% block title %}Afup - Association française des utilisateurs de PHP{% endblock %}
 
diff --git a/app/Resources/views/site/become_member.html.twig b/templates/site/become_member.html.twig
similarity index 99%
rename from app/Resources/views/site/become_member.html.twig
rename to templates/site/become_member.html.twig
index 0b0a48dd8..18d594aef 100644
--- a/app/Resources/views/site/become_member.html.twig
+++ b/templates/site/become_member.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Devenir membre de l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/cms_page/display.html.twig b/templates/site/cms_page/display.html.twig
similarity index 95%
rename from app/Resources/views/site/cms_page/display.html.twig
rename to templates/site/cms_page/display.html.twig
index 11180a5b9..242a50b4e 100644
--- a/app/Resources/views/site/cms_page/display.html.twig
+++ b/templates/site/cms_page/display.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}{{ article.titre }} - AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/company_membership/adhesion_entreprise.html.twig b/templates/site/company_membership/adhesion_entreprise.html.twig
similarity index 99%
rename from app/Resources/views/site/company_membership/adhesion_entreprise.html.twig
rename to templates/site/company_membership/adhesion_entreprise.html.twig
index b68743ca2..60c806298 100644
--- a/app/Resources/views/site/company_membership/adhesion_entreprise.html.twig
+++ b/templates/site/company_membership/adhesion_entreprise.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block page_title %}Adhésion entreprise à l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/company_membership/member_invitation.html.twig b/templates/site/company_membership/member_invitation.html.twig
similarity index 97%
rename from app/Resources/views/site/company_membership/member_invitation.html.twig
rename to templates/site/company_membership/member_invitation.html.twig
index 0f001e765..8eaba95db 100644
--- a/app/Resources/views/site/company_membership/member_invitation.html.twig
+++ b/templates/site/company_membership/member_invitation.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 {% block inner_content %}
     <article id="company-membership-invitation">
         <h1>Adhésion professionnelle à l'AFUP</h1>
diff --git a/app/Resources/views/site/company_membership/paybox_redirect.html.twig b/templates/site/company_membership/paybox_redirect.html.twig
similarity index 100%
rename from app/Resources/views/site/company_membership/paybox_redirect.html.twig
rename to templates/site/company_membership/paybox_redirect.html.twig
diff --git a/app/Resources/views/site/company_membership/payment.html.twig b/templates/site/company_membership/payment.html.twig
similarity index 96%
rename from app/Resources/views/site/company_membership/payment.html.twig
rename to templates/site/company_membership/payment.html.twig
index e724a8401..8de3bc43e 100644
--- a/app/Resources/views/site/company_membership/payment.html.twig
+++ b/templates/site/company_membership/payment.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 {% block page_content %}
     <article id="company-membership-payment">
         <h1>Adhésion entreprise à l'AFUP</h1>
diff --git a/app/Resources/views/site/company_public_profile.html.twig b/templates/site/company_public_profile.html.twig
similarity index 97%
rename from app/Resources/views/site/company_public_profile.html.twig
rename to templates/site/company_public_profile.html.twig
index f2dd77978..d0523d9c4 100644
--- a/app/Resources/views/site/company_public_profile.html.twig
+++ b/templates/site/company_public_profile.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':site:_members_menu.html.twig' with {
+    {% include 'site/_members_menu.html.twig' with {
         current: "compagnies"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/site/company_public_profile_list.html.twig b/templates/site/company_public_profile_list.html.twig
similarity index 94%
rename from app/Resources/views/site/company_public_profile_list.html.twig
rename to templates/site/company_public_profile_list.html.twig
index 444bcf531..a61220d79 100644
--- a/app/Resources/views/site/company_public_profile_list.html.twig
+++ b/templates/site/company_public_profile_list.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':site:_members_menu.html.twig' with {
+    {% include 'site/_members_menu.html.twig' with {
         current: "compagnies"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/site/home.html.twig b/templates/site/home.html.twig
similarity index 99%
rename from app/Resources/views/site/home.html.twig
rename to templates/site/home.html.twig
index 22714217c..ffe0a5dba 100644
--- a/app/Resources/views/site/home.html.twig
+++ b/templates/site/home.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% import _self as home_macros %}
 
diff --git a/app/Resources/views/site/meetups/list.html.twig b/templates/site/meetups/list.html.twig
similarity index 98%
rename from app/Resources/views/site/meetups/list.html.twig
rename to templates/site/meetups/list.html.twig
index 0695165aa..998a83c0e 100644
--- a/app/Resources/views/site/meetups/list.html.twig
+++ b/templates/site/meetups/list.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Les meetups des antennes de l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/member/company_public_profile.html.twig b/templates/site/member/company_public_profile.html.twig
similarity index 92%
rename from app/Resources/views/site/member/company_public_profile.html.twig
rename to templates/site/member/company_public_profile.html.twig
index 3a0772589..5874988a7 100644
--- a/app/Resources/views/site/member/company_public_profile.html.twig
+++ b/templates/site/member/company_public_profile.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_company_menu.html.twig' with {
+    {% include 'admin/association/membership/_company_menu.html.twig' with {
         current: "public_profile"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/site/member/index.html.twig b/templates/site/member/index.html.twig
similarity index 99%
rename from app/Resources/views/site/member/index.html.twig
rename to templates/site/member/index.html.twig
index 4ce91ff9f..f8456e875 100644
--- a/app/Resources/views/site/member/index.html.twig
+++ b/templates/site/member/index.html.twig
@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':site:secondary_menu.html.twig' with {
+    {% include 'site/secondary_menu.html.twig' with {
         menu: [
             {
                 "nom" : "Accueil",
diff --git a/app/Resources/views/site/member/techletter.html.twig b/templates/site/member/techletter.html.twig
similarity index 94%
rename from app/Resources/views/site/member/techletter.html.twig
rename to templates/site/member/techletter.html.twig
index 4efae1cba..16c6576c3 100644
--- a/app/Resources/views/site/member/techletter.html.twig
+++ b/templates/site/member/techletter.html.twig
@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
@@ -8,7 +8,7 @@
 
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "techletter"
     } only %}
 {% endblock %}
diff --git a/app/Resources/views/site/news/display.html.twig b/templates/site/news/display.html.twig
similarity index 98%
rename from app/Resources/views/site/news/display.html.twig
rename to templates/site/news/display.html.twig
index 1e2bc2ba5..ba5e38bde 100644
--- a/app/Resources/views/site/news/display.html.twig
+++ b/templates/site/news/display.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}{{ article.getTitle }} - AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/news/list.html.twig b/templates/site/news/list.html.twig
similarity index 99%
rename from app/Resources/views/site/news/list.html.twig
rename to templates/site/news/list.html.twig
index 95954cd80..9e75b5c25 100644
--- a/app/Resources/views/site/news/list.html.twig
+++ b/templates/site/news/list.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Les actualités de l'AFUP, page {{ current_page }}{% endblock %}
 
diff --git a/app/Resources/views/site/newsletter/postsubscribe.html.twig b/templates/site/newsletter/postsubscribe.html.twig
similarity index 95%
rename from app/Resources/views/site/newsletter/postsubscribe.html.twig
rename to templates/site/newsletter/postsubscribe.html.twig
index 075f3a2ac..e46561e6a 100644
--- a/app/Resources/views/site/newsletter/postsubscribe.html.twig
+++ b/templates/site/newsletter/postsubscribe.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 {% block inner_content %}
     <article id="company-membership">
         <h1>Inscription à la newsletter de l'AFUP</h1>
diff --git a/app/Resources/views/site/newsletter/subscribe.html.twig b/templates/site/newsletter/subscribe.html.twig
similarity index 100%
rename from app/Resources/views/site/newsletter/subscribe.html.twig
rename to templates/site/newsletter/subscribe.html.twig
diff --git a/app/Resources/views/site/offices.html.twig b/templates/site/offices.html.twig
similarity index 99%
rename from app/Resources/views/site/offices.html.twig
rename to templates/site/offices.html.twig
index f870ee0e3..4c563c955 100644
--- a/app/Resources/views/site/offices.html.twig
+++ b/templates/site/offices.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Les antennes de l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/pager.html.twig b/templates/site/pager.html.twig
similarity index 100%
rename from app/Resources/views/site/pager.html.twig
rename to templates/site/pager.html.twig
diff --git a/app/Resources/views/site/rss.xml.twig b/templates/site/rss.xml.twig
similarity index 100%
rename from app/Resources/views/site/rss.xml.twig
rename to templates/site/rss.xml.twig
diff --git a/app/Resources/views/site/secondary_menu.html.twig b/templates/site/secondary_menu.html.twig
similarity index 100%
rename from app/Resources/views/site/secondary_menu.html.twig
rename to templates/site/secondary_menu.html.twig
diff --git a/app/Resources/views/site/sitemap.html.twig b/templates/site/sitemap.html.twig
similarity index 97%
rename from app/Resources/views/site/sitemap.html.twig
rename to templates/site/sitemap.html.twig
index 195255580..bc4163808 100644
--- a/app/Resources/views/site/sitemap.html.twig
+++ b/templates/site/sitemap.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Plan du site de l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/superapero.html.twig b/templates/site/superapero.html.twig
similarity index 98%
rename from app/Resources/views/site/superapero.html.twig
rename to templates/site/superapero.html.twig
index 561648802..1d71a47bd 100644
--- a/app/Resources/views/site/superapero.html.twig
+++ b/templates/site/superapero.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 {% block stylesheets %}
     {{ parent() }}
     <link rel="stylesheet" href="{{ asset('css/grid.css') }}" media="all" />
diff --git a/app/Resources/views/site/talks/list.html.twig b/templates/site/talks/list.html.twig
similarity index 99%
rename from app/Resources/views/site/talks/list.html.twig
rename to templates/site/talks/list.html.twig
index 356e7a7d8..86074517a 100644
--- a/app/Resources/views/site/talks/list.html.twig
+++ b/templates/site/talks/list.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}Historique des conférences de l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/talks/show.html.twig b/templates/site/talks/show.html.twig
similarity index 99%
rename from app/Resources/views/site/talks/show.html.twig
rename to templates/site/talks/show.html.twig
index f08cfffb6..f2901fdd1 100644
--- a/app/Resources/views/site/talks/show.html.twig
+++ b/templates/site/talks/show.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
@@ -218,7 +218,7 @@
         {% endif %}
 
         {% if comments|length > 0 %}
-            {% include ':common:star.html.twig' %}
+            {% include 'common/star.html.twig' %}
             <div class="container">
                 <div class="col-md-12">
                     <div class="container comments-title-container">
diff --git a/app/Resources/views/site/techletter/index.html.twig b/templates/site/techletter/index.html.twig
similarity index 98%
rename from app/Resources/views/site/techletter/index.html.twig
rename to templates/site/techletter/index.html.twig
index 6d5df30b7..c10875357 100644
--- a/app/Resources/views/site/techletter/index.html.twig
+++ b/templates/site/techletter/index.html.twig
@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block title %}La veille de l'AFUP{% endblock %}