diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageTest.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageTest.java
index b3a52f49e542..5b6e4faf5743 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageTest.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageTest.java
@@ -86,8 +86,6 @@ public class PageTest
 {
     private static final String SKIN_PROPERTIES_PATH = "/skins/flamingo/skin.properties";
 
-    private static final String SKIN_FLAMINGO_PREFIX_PATH = "/skins/flamingo";
-
     @InjectMockitoOldcore
     protected MockitoOldcore oldcore;
 
@@ -339,18 +337,10 @@ protected void initializeEnvironmentResources() throws Exception
                 String resourceName = (String) invocation.getArguments()[0];
                 // Algorithm:
                 // - Try to load the passed resource name from the CL first
-                // - If the resource is a template (ends in .vm) then remove the /skins/flamingo prefix from the
-                //   resource name and try again to load it from the CL
                 // - If not found, then let tests be able to override {@code getEnvironmentResource()}.
                 URL url = getClass().getResource(resourceName);
                 if (url == null) {
-                    String shortName = getShortTemplateResourceName(resourceName);
-                    if (shortName != null) {
-                        url = getClass().getResource(shortName);
-                    }
-                    if (url == null) {
-                        url = getEnvironmentResource(resourceName);
-                    }
+                    url = getEnvironmentResource(resourceName);
                 }
                 return url;
             });
@@ -359,29 +349,15 @@ protected void initializeEnvironmentResources() throws Exception
                 String resourceName = (String) invocation.getArguments()[0];
                 // Algorithm:
                 // - Try to load the passed resource name from the CL first
-                // - If the resource is a template (ends in .vm) then remove the /skins/flamingo prefix from the
-                //   resource name and try again to load it from the CL
                 // - If not found, then let tests be able to override {@code getEnvironmentResource()}.
                 InputStream is = getClass().getResourceAsStream(resourceName);
                 if (is == null) {
-                    String shortName = getShortTemplateResourceName(resourceName);
-                    if (shortName != null) {
-                        is = getClass().getResourceAsStream(shortName);
-                    }
-                    if (is == null) {
-                        is = getEnvironmentResourceAsStream(resourceName);
-                    }
+                    is = getEnvironmentResourceAsStream(resourceName);
                 }
                 return is;
             });
     }
 
-    private String getShortTemplateResourceName(String resourceName)
-    {
-        return resourceName.startsWith(SKIN_FLAMINGO_PREFIX_PATH) ?
-            StringUtils.substringAfter(resourceName, SKIN_FLAMINGO_PREFIX_PATH) : null;
-    }
-
     protected URL getEnvironmentResource(String resourceName) throws Exception
     {
         // Tests should override this if they need to serve the resource from a location other than the classloader
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/accessdenied.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/accessdenied.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/accessdenied.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/accessdenied.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/ad.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/ad.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/ad.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/ad.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adduorg.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adduorg.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adduorg.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adduorg.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/admin.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/admin.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/admin.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/admin.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adminexport.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adminexport.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adminexport.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adminexport.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adminimport.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adminimport.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/adminimport.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/adminimport.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/annotations.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/annotations.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/annotations.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/annotations.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/annotationsinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/annotationsinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/annotationsinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/annotationsinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attach.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attach.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attach.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attach.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attachmentdoesnotexist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attachmentdoesnotexist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attachmentdoesnotexist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attachmentdoesnotexist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attachments.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attachments.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/attachments.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/attachments.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/backlinks.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/backlinks.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/backlinks.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/backlinks.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changes.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changes.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changes.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changes.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesall.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesall.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesall.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesall.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesdoc.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesdoc.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesdoc.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesdoc.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/changesinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/children.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/children.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/children.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/children.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/code.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/code.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/code.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/code.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/comments.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/comments.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/comments.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/comments.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/comments2.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/comments2.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/comments2.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/comments2.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/contentvars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/contentvars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/contentvars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/contentvars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/copy.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/copy.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/copy.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/copy.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/create.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/create.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/create.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/create.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/createinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/createinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/createinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/createinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/debug.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/debug.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/debug.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/debug.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleted.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleted.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleted.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleted.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletedspace.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletedspace.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletedspace.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletedspace.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletegroupmember.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletegroupmember.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletegroupmember.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletegroupmember.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletespace.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletespace.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deletespace.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deletespace.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleteuorg.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleteuorg.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleteuorg.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleteuorg.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleteversionsconfirm.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleteversionsconfirm.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deleteversionsconfirm.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deleteversionsconfirm.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deprecatedMacros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deprecatedMacros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deprecatedMacros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deprecatedMacros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deprecatedVars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deprecatedVars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/deprecatedVars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/deprecatedVars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/diff_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/diff_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/display.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/display.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/display_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/display_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/display_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displaycontent.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displaycontent.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displaycontent.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displaycontent.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_date.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_date.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_date.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_date.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_dblist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_dblist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_dblist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_dblist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_groups.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_groups.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_groups.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_groups.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_page.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_page.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_page.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_page.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_staticlist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_staticlist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_staticlist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_staticlist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_timezone.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_timezone.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_timezone.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_timezone.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_users.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_users.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/displayer_users.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/displayer_users.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/eventmigration.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/eventmigration.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/eventmigration.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/eventmigration.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.finalize.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.finalize.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.finalize.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.finalize.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.report.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.report.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.report.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.report.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.apply.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.apply.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.clean.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.clean.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.defaultui.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.defaultui.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.defaultui.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.defaultui.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.defaultui.wikis.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.defaultui.wikis.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.defaultui.wikis.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.defaultui.wikis.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.flavor.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.flavor.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.flavor.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.flavor.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.flavor.wikis.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.flavor.wikis.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.flavor.wikis.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.flavor.wikis.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.outdatedextensions.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.outdatedextensions.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/extension.outdatedextensions.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/extension.outdatedextensions.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/firstadminuser.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/firstadminuser.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/firstadminuser.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/firstadminuser.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/report.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/report.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/report.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/report.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/welcome.wiki b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/welcome.wiki
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/distribution/welcome.wiki
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/distribution/welcome.wiki
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/docalreadyexists.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/docalreadyexists.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/docalreadyexists.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/docalreadyexists.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/documentTags.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/documentTags.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/documentTags.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/documentTags.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/edit_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/edit_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/edit_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/edit_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdomPureText.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdomPureText.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdomPureText.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdomPureText.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdomText.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdomText.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdomText.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdomText.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdom_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdom_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editors/xdom_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editors/xdom_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editpanels.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editpanels.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editpanels.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editpanels.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editpanelsvars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editpanelsvars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editpanelsvars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editpanelsvars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editrights.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editrights.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editrights.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editrights.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/edituser.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/edituser.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/edituser.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/edituser.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editwysiwyg.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editwysiwyg.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/editwysiwyg.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/editwysiwyg.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/endpage.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/endpage.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/endpage.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/endpage.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/entitynamevalidation_json.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/entitynamevalidation_json.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/entitynamevalidation_json.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/entitynamevalidation_json.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/error.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/error.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/error.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/error.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/exception.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/exception.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/exception.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/exception.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/exceptioninline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/exceptioninline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/exceptioninline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/exceptioninline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/export.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/export.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/export.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/export.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/extension.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/extension.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/extension.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/extension.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/extensionHistory.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/extensionHistory.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/extensionHistory.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/extensionHistory.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/fakeleftpanels.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/fakeleftpanels.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/fakeleftpanels.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/fakeleftpanels.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/fakerightpanels.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/fakerightpanels.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/fakerightpanels.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/fakerightpanels.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/picker_flavors.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/picker_flavors.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/picker_flavors.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/picker_flavors.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/picker_results.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/picker_results.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/flavor/picker_results.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/flavor/picker_results.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/forgotusername.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/forgotusername.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/frequentlyUsedDocs.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/frequentlyUsedDocs.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/frequentlyUsedDocs.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/frequentlyUsedDocs.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/get.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/get.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/get.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/get.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getdeleteddocuments.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getdeleteddocuments.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getdeleteddocuments.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getdeleteddocuments.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getdocuments.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getdocuments.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getdocuments.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getdocuments.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getgroupmembers.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getgroupmembers.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getgroupmembers.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getgroupmembers.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getgroups.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getgroups.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getgroups.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getgroups.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getusers.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getusers.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusers.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getusersandgroups.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusersandgroups.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/getusersandgroups.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/getusersandgroups.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/header.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/header.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/header.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/header.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/hierarchy_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/hierarchy_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/hierarchy_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/hierarchy_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/hierarchy_reference.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/hierarchy_reference.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/hierarchy_reference.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/hierarchy_reference.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/history.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/history.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/history.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/history.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/attachmentreference/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/attachmentreference/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/attachmentreference/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/attachmentreference/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/boolean/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/boolean/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/boolean/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/boolean/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/color/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/color/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/color/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/color/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/date/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/date/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/date/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/date/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/documentreference/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/documentreference/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/documentreference/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/documentreference/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/entityreferencestring/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/entityreferencestring/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/entityreferencestring/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/entityreferencestring/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/entitytype/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/entitytype/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/entitytype/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/entitytype/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/enum/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/enum/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/enum/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/enum/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/userreference/edit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/userreference/edit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/html_displayer/userreference/edit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/html_displayer/userreference/edit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/htmlfooter.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/htmlfooter.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/htmlfooter.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/htmlfooter.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/import.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/import.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/import.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/import.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/imported.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/imported.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/imported.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/imported.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/importinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/importinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/importinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/importinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/information.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/information.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/information.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/information.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/informationinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/informationinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/informationinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/informationinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/init.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/init.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/init.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/init.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/inline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/inline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/inline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/inline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/answer/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/answer/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/answer/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/answer/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/answer/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/answer/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/answer/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/answer/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.data.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.data.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.data.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.data.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.form.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.form.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.form.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.form.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/ExtensionBreakingQuestion.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/ExtensionBreakingQuestion.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/OverwriteQuestion.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/OverwriteQuestion.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/OverwriteQuestion.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/OverwriteQuestion.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.data.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.data.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.data.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.data.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.form.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.form.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.form.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.form.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/XClassBreakingQuestion.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/XClassBreakingQuestion.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job/question/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job/question/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job_status_json.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job_status_json.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/job_status_json.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/job_status_json.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/layoutExtraVars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/layoutExtraVars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/layoutExtraVars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/layoutExtraVars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/leftpanels.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/leftpanels.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/leftpanels.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/leftpanels.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/locationPicker_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/locationPicker_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/logging_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/logging_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/logging_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/logging_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/macros.txt b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.txt
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/macros.txt
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.txt
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/message.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/message.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/message.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/message.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notice.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notice.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notice.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notice.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/directMessage.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/directMessage.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/directMessage.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/directMessage.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/default.html.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/default.html.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/default.html.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/default.html.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/default.plain.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/default.plain.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/default.plain.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/default.plain.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/directMessage.html.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/directMessage.html.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/directMessage.html.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/directMessage.html.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/directMessage.plain.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/directMessage.plain.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/directMessage.plain.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/directMessage.plain.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/personalMessage.html.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/personalMessage.html.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/personalMessage.html.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/personalMessage.html.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/personalMessage.plain.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/personalMessage.plain.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/personalMessage.plain.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/personalMessage.plain.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/publicMessage.html.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/publicMessage.html.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/publicMessage.html.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/publicMessage.html.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/publicMessage.plain.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/publicMessage.plain.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/email/publicMessage.plain.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/publicMessage.plain.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/eventUserNotificationFilter.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/eventUserNotificationFilter.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/eventUserNotificationFilter.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/eventUserNotificationFilter.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/scopeNotificationFilter.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/scopeNotificationFilter.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/filters/scopeNotificationFilter.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/filters/scopeNotificationFilter.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/groupMessage.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/groupMessage.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/groupMessage.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/groupMessage.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/personalMessage.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/personalMessage.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/personalMessage.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/personalMessage.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/publicMessage.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/publicMessage.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/publicMessage.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/publicMessage.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/rss/default.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/notification/rss/default.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/rss/default.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/office.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/office.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/office.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/office.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packagedescriptor.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packagedescriptor.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packagedescriptor.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packagedescriptor.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packageinfo.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packageinfo.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packageinfo.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packageinfo.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packagelist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packagelist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/packagelist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/packagelist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/passwd.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/passwd.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdf.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdf.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdf.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdf.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfcover.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfcover.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfcover.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfcover.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdffooter.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdffooter.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdffooter.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdffooter.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfheader.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfheader.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfheader.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfheader.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfhtmlheader.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfhtmlheader.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfhtmlheader.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfhtmlheader.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfoptions.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfoptions.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdfoptions.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdfoptions.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdftoc.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdftoc.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/pdftoc.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/pdftoc.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/plain.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/plain.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/plain.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/plain.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/popup.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/popup.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/popup.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/popup.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/portletConfig.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/portletConfig.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/portletConfig.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/portletConfig.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/print.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/print.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/print.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/print.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/progress_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/progress_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/progress_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/progress_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rating_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rating_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rating_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rating_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rdf.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rdf.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rdf.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rdf.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/recyclebin.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/recyclebin.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/recyclebin.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/recyclebin.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/recyclebinlist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/recyclebinlist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/recyclebinlist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/recyclebinlist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/refactoringStatus_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/refactoringStatus_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/refactoringStatus_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/refactoringStatus_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/register.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/register.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/register_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/register_macros.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/register_macros.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/registerinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/registerinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/registerinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/registerinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rename.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rename.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rename.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rename.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/renameStatus.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/renameStatus.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/renameStatus.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/renameStatus.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rendercontent.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rendercontent.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rendercontent.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rendercontent.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetpassword.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpassword.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetpassword.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpassword.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetpasswordinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetpasswordinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetversions.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetversions.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetversions.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetversions.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetversionsdone.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetversionsdone.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resetversionsdone.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetversionsdone.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resubmit.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resubmit.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/resubmit.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resubmit.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rightpanels.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rightpanels.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rightpanels.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rightpanels.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rollback.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rollback.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/rollback.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/rollback.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/saverights.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/saverights.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/saverights.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/saverights.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/share.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/share.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/share.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/share.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/shareinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/shareinline.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/shareinline.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/shareinline.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/siblings.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/siblings.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/siblings.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/siblings.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/simpleedittoolbar.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/simpleedittoolbar.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/simpleedittoolbar.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/simpleedittoolbar.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/stylesheets.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/stylesheets.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/stylesheets.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/stylesheets.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/suggest.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/suggest.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/suggest.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/suggest.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templatedoesnotexist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/templatedoesnotexist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templatedoesnotexist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/templatedoesnotexist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/titlevars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/titlevars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/titlevars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/titlevars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/treeview.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/treeview.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/treeview.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/treeview.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/uorgsuggest.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/uorgsuggest.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/uorgsuggest.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/uorgsuggest.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/uploadfailure.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/uploadfailure.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/uploadfailure.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/uploadfailure.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/userinactive.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/userinactive.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/userinactive.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/userinactive.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/viewattachrev.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/viewattachrev.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/viewattachrev.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/viewattachrev.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/viewchanges.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/viewchanges.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/viewchanges.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/viewchanges.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/warning.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/warning.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/warning.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/warning.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/watch.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/watch.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/watch.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/watch.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/wikidoesnotexist.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/wikidoesnotexist.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/wikidoesnotexist.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/wikidoesnotexist.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xml.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xml.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xml.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xml.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xpart.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xpart.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xpart.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xpart.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xwikivars.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xwikivars.vm
similarity index 100%
rename from xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/xwikivars.vm
rename to xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/xwikivars.vm
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
index 00335386ff7d..38d4863ab893 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
@@ -113,7 +113,7 @@
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/templates</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
             </configuration>
           </execution>
         </executions>