diff --git a/templates/authentic2/auth/login_password_profile.html b/authentic2/templates/auth/login_password_profile.html
similarity index 100%
rename from templates/authentic2/auth/login_password_profile.html
rename to authentic2/templates/auth/login_password_profile.html
diff --git a/templates/authentic2/authentic2/login.html b/authentic2/templates/authentic2/login.html
similarity index 100%
rename from templates/authentic2/authentic2/login.html
rename to authentic2/templates/authentic2/login.html
diff --git a/templates/authentic2/authentic2/login_password_form.html b/authentic2/templates/authentic2/login_password_form.html
similarity index 100%
rename from templates/authentic2/authentic2/login_password_form.html
rename to authentic2/templates/authentic2/login_password_form.html
diff --git a/templates/authentic2/base.html b/authentic2/templates/base.html
similarity index 100%
rename from templates/authentic2/base.html
rename to authentic2/templates/base.html
diff --git a/templates/authentic2/idp/account_management.html b/authentic2/templates/idp/account_management.html
similarity index 100%
rename from templates/authentic2/idp/account_management.html
rename to authentic2/templates/idp/account_management.html
diff --git a/templates/authentic2/idp/homepage.html b/authentic2/templates/idp/homepage.html
similarity index 100%
rename from templates/authentic2/idp/homepage.html
rename to authentic2/templates/idp/homepage.html
diff --git a/templates/authentic2/idp/logout.html b/authentic2/templates/idp/logout.html
similarity index 100%
rename from templates/authentic2/idp/logout.html
rename to authentic2/templates/idp/logout.html
diff --git a/templates/static/f-s-b/css/entrouvert.css b/common/static/f-s-b/css/entrouvert.css
similarity index 100%
rename from templates/static/f-s-b/css/entrouvert.css
rename to common/static/f-s-b/css/entrouvert.css
diff --git a/templates/static/f-s-b/css/fields.css b/common/static/f-s-b/css/fields.css
similarity index 100%
rename from templates/static/f-s-b/css/fields.css
rename to common/static/f-s-b/css/fields.css
diff --git a/templates/static/f-s-b/css/images/arrow_white.png b/common/static/f-s-b/css/images/arrow_white.png
similarity index 100%
rename from templates/static/f-s-b/css/images/arrow_white.png
rename to common/static/f-s-b/css/images/arrow_white.png
diff --git a/templates/static/f-s-b/css/images/contact_link.gif b/common/static/f-s-b/css/images/contact_link.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/contact_link.gif
rename to common/static/f-s-b/css/images/contact_link.gif
diff --git a/templates/static/f-s-b/css/images/highlightLink_newsletter.gif b/common/static/f-s-b/css/images/highlightLink_newsletter.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/highlightLink_newsletter.gif
rename to common/static/f-s-b/css/images/highlightLink_newsletter.gif
diff --git a/templates/static/f-s-b/css/images/highlightLink_planguide.gif b/common/static/f-s-b/css/images/highlightLink_planguide.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/highlightLink_planguide.gif
rename to common/static/f-s-b/css/images/highlightLink_planguide.gif
diff --git a/templates/static/f-s-b/css/images/home.gif b/common/static/f-s-b/css/images/home.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/home.gif
rename to common/static/f-s-b/css/images/home.gif
diff --git a/templates/static/f-s-b/css/images/menu_current.gif b/common/static/f-s-b/css/images/menu_current.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/menu_current.gif
rename to common/static/f-s-b/css/images/menu_current.gif
diff --git a/templates/static/f-s-b/css/images/puce_bleu_clair.png b/common/static/f-s-b/css/images/puce_bleu_clair.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_bleu_clair.png
rename to common/static/f-s-b/css/images/puce_bleu_clair.png
diff --git a/templates/static/f-s-b/css/images/puce_bleu_fonce.png b/common/static/f-s-b/css/images/puce_bleu_fonce.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_bleu_fonce.png
rename to common/static/f-s-b/css/images/puce_bleu_fonce.png
diff --git a/templates/static/f-s-b/css/images/puce_orange.png b/common/static/f-s-b/css/images/puce_orange.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_orange.png
rename to common/static/f-s-b/css/images/puce_orange.png
diff --git a/templates/static/f-s-b/css/images/puce_orange_clair.png b/common/static/f-s-b/css/images/puce_orange_clair.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_orange_clair.png
rename to common/static/f-s-b/css/images/puce_orange_clair.png
diff --git a/templates/static/f-s-b/css/images/puce_rose_fonce.png b/common/static/f-s-b/css/images/puce_rose_fonce.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_rose_fonce.png
rename to common/static/f-s-b/css/images/puce_rose_fonce.png
diff --git a/templates/static/f-s-b/css/images/puce_verte.png b/common/static/f-s-b/css/images/puce_verte.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_verte.png
rename to common/static/f-s-b/css/images/puce_verte.png
diff --git a/templates/static/f-s-b/css/images/puce_verte_fonce.png b/common/static/f-s-b/css/images/puce_verte_fonce.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_verte_fonce.png
rename to common/static/f-s-b/css/images/puce_verte_fonce.png
diff --git a/templates/static/f-s-b/css/images/puce_violet.png b/common/static/f-s-b/css/images/puce_violet.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_violet.png
rename to common/static/f-s-b/css/images/puce_violet.png
diff --git a/templates/static/f-s-b/css/images/puce_violet_fonce.png b/common/static/f-s-b/css/images/puce_violet_fonce.png
similarity index 100%
rename from templates/static/f-s-b/css/images/puce_violet_fonce.png
rename to common/static/f-s-b/css/images/puce_violet_fonce.png
diff --git a/templates/static/f-s-b/css/images/search_background.png b/common/static/f-s-b/css/images/search_background.png
similarity index 100%
rename from templates/static/f-s-b/css/images/search_background.png
rename to common/static/f-s-b/css/images/search_background.png
diff --git a/templates/static/f-s-b/css/images/toplink_separator.gif b/common/static/f-s-b/css/images/toplink_separator.gif
similarity index 100%
rename from templates/static/f-s-b/css/images/toplink_separator.gif
rename to common/static/f-s-b/css/images/toplink_separator.gif
diff --git a/templates/static/f-s-b/css/images/toplink_separator_interior.png b/common/static/f-s-b/css/images/toplink_separator_interior.png
similarity index 100%
rename from templates/static/f-s-b/css/images/toplink_separator_interior.png
rename to common/static/f-s-b/css/images/toplink_separator_interior.png
diff --git a/templates/static/f-s-b/css/mainstyles.css b/common/static/f-s-b/css/mainstyles.css
similarity index 100%
rename from templates/static/f-s-b/css/mainstyles.css
rename to common/static/f-s-b/css/mainstyles.css
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.eot b/common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.eot
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.eot
rename to common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.eot
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.svg b/common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.svg
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.svg
rename to common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.svg
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.ttf b/common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.ttf
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.ttf
rename to common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.ttf
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.woff b/common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.woff
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-regular-webfont.woff
rename to common/static/f-s-b/css/yanonekaffeesatz-regular-webfont.woff
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.eot b/common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.eot
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.eot
rename to common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.eot
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.svg b/common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.svg
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.svg
rename to common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.svg
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.ttf b/common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.ttf
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.ttf
rename to common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.ttf
diff --git a/templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.woff b/common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.woff
similarity index 100%
rename from templates/static/f-s-b/css/yanonekaffeesatz-thin-webfont.woff
rename to common/static/f-s-b/css/yanonekaffeesatz-thin-webfont.woff
diff --git a/templates/static/f-s-b/img/3_fleurs_footer.jpg b/common/static/f-s-b/img/3_fleurs_footer.jpg
similarity index 100%
rename from templates/static/f-s-b/img/3_fleurs_footer.jpg
rename to common/static/f-s-b/img/3_fleurs_footer.jpg
diff --git a/templates/static/f-s-b/img/Ordi_20.jpg b/common/static/f-s-b/img/Ordi_20.jpg
similarity index 100%
rename from templates/static/f-s-b/img/Ordi_20.jpg
rename to common/static/f-s-b/img/Ordi_20.jpg
diff --git a/templates/static/f-s-b/img/logo_footer.gif b/common/static/f-s-b/img/logo_footer.gif
similarity index 100%
rename from templates/static/f-s-b/img/logo_footer.gif
rename to common/static/f-s-b/img/logo_footer.gif
diff --git a/templates/static/f-s-b/img/oms_footer.jpg b/common/static/f-s-b/img/oms_footer.jpg
similarity index 100%
rename from templates/static/f-s-b/img/oms_footer.jpg
rename to common/static/f-s-b/img/oms_footer.jpg
diff --git a/templates/static/f-s-b/img/ville_amie_enfant_footer.jpg b/common/static/f-s-b/img/ville_amie_enfant_footer.jpg
similarity index 100%
rename from templates/static/f-s-b/img/ville_amie_enfant_footer.jpg
rename to common/static/f-s-b/img/ville_amie_enfant_footer.jpg
diff --git a/templates/static/f-s-b/img/ville_internet_footer.jpg b/common/static/f-s-b/img/ville_internet_footer.jpg
similarity index 100%
rename from templates/static/f-s-b/img/ville_internet_footer.jpg
rename to common/static/f-s-b/img/ville_internet_footer.jpg
diff --git a/templates/portail-citoyen/base-cms.html b/portail-citoyen/templates/base-cms.html
similarity index 100%
rename from templates/portail-citoyen/base-cms.html
rename to portail-citoyen/templates/base-cms.html
diff --git a/templates/portail-citoyen/base.html b/portail-citoyen/templates/base.html
similarity index 100%
rename from templates/portail-citoyen/base.html
rename to portail-citoyen/templates/base.html
diff --git a/templates/portail-citoyen/blurps/demandes-en-cours.html b/portail-citoyen/templates/blurps/demandes-en-cours.html
similarity index 100%
rename from templates/portail-citoyen/blurps/demandes-en-cours.html
rename to portail-citoyen/templates/blurps/demandes-en-cours.html
diff --git a/templates/portail-citoyen/blurps/liste-des-teleservices.html b/portail-citoyen/templates/blurps/liste-des-teleservices.html
similarity index 100%
rename from templates/portail-citoyen/blurps/liste-des-teleservices.html
rename to portail-citoyen/templates/blurps/liste-des-teleservices.html
diff --git a/templates/portail-citoyen/portail_citoyen/template_ezt.html b/portail-citoyen/templates/portail_citoyen/template_ezt.html
similarity index 100%
rename from templates/portail-citoyen/portail_citoyen/template_ezt.html
rename to portail-citoyen/templates/portail_citoyen/template_ezt.html
diff --git a/templates/wcs/fsb/static b/templates/wcs/fsb/static
deleted file mode 120000
index 8e9b74c..0000000
--- a/templates/wcs/fsb/static
+++ /dev/null
@@ -1 +0,0 @@
-../../static
\ No newline at end of file
diff --git a/templates/wcs/fsb/desc.xml b/wcs/fsb/desc.xml
similarity index 100%
rename from templates/wcs/fsb/desc.xml
rename to wcs/fsb/desc.xml