From c1a6b3d0f47f363b83a73072a235985e431836e0 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Sat, 20 Jul 2013 14:38:34 +1000
Subject: [PATCH] Move templates files into template folder

---
 .../src/main/webapp/WEB-INF/template/template_v1.xhtml      | 6 +++---
 zanata-war/src/main/webapp/account/activate.xhtml           | 2 +-
 zanata-war/src/main/webapp/account/changepassword.xhtml     | 2 +-
 zanata-war/src/main/webapp/account/inactive_account.xhtml   | 2 +-
 zanata-war/src/main/webapp/account/login.xhtml              | 2 +-
 zanata-war/src/main/webapp/account/login_input.xhtml        | 2 +-
 zanata-war/src/main/webapp/account/logout.xhtml             | 2 +-
 zanata-war/src/main/webapp/account/password_reset.xhtml     | 2 +-
 .../src/main/webapp/account/password_reset_request.xhtml    | 2 +-
 zanata-war/src/main/webapp/account/register.xhtml           | 2 +-
 zanata-war/src/main/webapp/account/validate_email.xhtml     | 2 +-
 zanata-war/src/main/webapp/admin/home.xhtml                 | 2 +-
 zanata-war/src/main/webapp/admin/languagemanager.xhtml      | 2 +-
 zanata-war/src/main/webapp/admin/processmanager.xhtml       | 2 +-
 zanata-war/src/main/webapp/admin/roledetail.xhtml           | 2 +-
 zanata-war/src/main/webapp/admin/rolemanager.xhtml          | 2 +-
 zanata-war/src/main/webapp/admin/roleruledetails.xhtml      | 2 +-
 zanata-war/src/main/webapp/admin/rolerules.xhtml            | 2 +-
 zanata-war/src/main/webapp/admin/search.xhtml               | 2 +-
 zanata-war/src/main/webapp/admin/server_configuration.xhtml | 2 +-
 zanata-war/src/main/webapp/admin/stats.xhtml                | 2 +-
 .../src/main/webapp/admin/supportedlanguagedetail.xhtml     | 2 +-
 zanata-war/src/main/webapp/admin/userdetail.xhtml           | 2 +-
 zanata-war/src/main/webapp/admin/usermanager.xhtml          | 2 +-
 zanata-war/src/main/webapp/dashboard/home.xhtml             | 2 +-
 zanata-war/src/main/webapp/edit_home_content.xhtml          | 2 +-
 zanata-war/src/main/webapp/edit_home_content_code.xhtml     | 2 +-
 zanata-war/src/main/webapp/error.xhtml                      | 2 +-
 zanata-war/src/main/webapp/glossary/view.xhtml              | 2 +-
 zanata-war/src/main/webapp/help/contact_admin.xhtml         | 2 +-
 zanata-war/src/main/webapp/help/edit_help_content.xhtml     | 2 +-
 zanata-war/src/main/webapp/help/view.xhtml                  | 2 +-
 zanata-war/src/main/webapp/home.xhtml                       | 2 +-
 zanata-war/src/main/webapp/iteration/copy_trans.xhtml       | 2 +-
 zanata-war/src/main/webapp/iteration/edit.xhtml             | 2 +-
 zanata-war/src/main/webapp/iteration/files.xhtml            | 2 +-
 .../src/main/webapp/iteration/request_to_join_group.xhtml   | 2 +-
 zanata-war/src/main/webapp/iteration/source_files.xhtml     | 2 +-
 zanata-war/src/main/webapp/iteration/view.xhtml             | 2 +-
 .../src/main/webapp/language/contact_coordinator.xhtml      | 2 +-
 zanata-war/src/main/webapp/language/home.xhtml              | 2 +-
 zanata-war/src/main/webapp/language/language.xhtml          | 2 +-
 .../main/webapp/language/request_to_join_update_role.xhtml  | 2 +-
 zanata-war/src/main/webapp/profile/add_identity.xhtml       | 2 +-
 zanata-war/src/main/webapp/profile/edit.xhtml               | 2 +-
 zanata-war/src/main/webapp/profile/identities.xhtml         | 2 +-
 zanata-war/src/main/webapp/profile/merge_account.xhtml      | 2 +-
 zanata-war/src/main/webapp/profile/view.xhtml               | 2 +-
 zanata-war/src/main/webapp/project/add_iteration.xhtml      | 2 +-
 zanata-war/src/main/webapp/project/assign_maintainer.xhtml  | 2 +-
 zanata-war/src/main/webapp/project/copy_trans_options.xhtml | 2 +-
 zanata-war/src/main/webapp/project/create_project.xhtml     | 2 +-
 zanata-war/src/main/webapp/project/edit.xhtml               | 2 +-
 zanata-war/src/main/webapp/project/home.xhtml               | 2 +-
 zanata-war/src/main/webapp/project/homepage_edit.xhtml      | 2 +-
 zanata-war/src/main/webapp/project/project.xhtml            | 2 +-
 zanata-war/src/main/webapp/search.xhtml                     | 2 +-
 .../src/main/webapp/version-group/assign_maintainer.xhtml   | 2 +-
 .../main/webapp/version-group/create_version_group.xhtml    | 2 +-
 zanata-war/src/main/webapp/version-group/edit.xhtml         | 2 +-
 zanata-war/src/main/webapp/version-group/home.xhtml         | 2 +-
 .../src/main/webapp/version-group/request_to_join.xhtml     | 2 +-
 .../src/main/webapp/version-group/version_group.xhtml       | 2 +-
 63 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
index 87708f406d..86df70eb2e 100755
--- a/zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
@@ -48,10 +48,10 @@
 
 		<h:body styleClass="new-zanata">
 			<div class="off-canvas__outer new-zanata">
-				<ui:include src="../menu/left_menu.xhtml" />
-				<ui:include src="../menu/right_menu.xhtml" />
+				<ui:include src="../template/left_menu.xhtml" />
+				<ui:include src="../template/right_menu.xhtml" />
 				<div class="off-canvas__inner">
-					<ui:include src="../menu/banner.xhtml" />	
+					<ui:include src="../template/banner.xhtml" />	
 					
 					<main role="main" class="l--pad-v-1">
 			        	<div class="l__wrapper">
diff --git a/zanata-war/src/main/webapp/account/activate.xhtml b/zanata-war/src/main/webapp/account/activate.xhtml
index 267ce6bb52..e533a82432 100644
--- a/zanata-war/src/main/webapp/account/activate.xhtml
+++ b/zanata-war/src/main/webapp/account/activate.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.ActivateAccount']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/changepassword.xhtml b/zanata-war/src/main/webapp/account/changepassword.xhtml
index 5d9aa4a5de..be2b59cdca 100644
--- a/zanata-war/src/main/webapp/account/changepassword.xhtml
+++ b/zanata-war/src/main/webapp/account/changepassword.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.ChangePassword']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/inactive_account.xhtml b/zanata-war/src/main/webapp/account/inactive_account.xhtml
index 392a07d787..b4f92eea0f 100644
--- a/zanata-war/src/main/webapp/account/inactive_account.xhtml
+++ b/zanata-war/src/main/webapp/account/inactive_account.xhtml
@@ -5,7 +5,7 @@
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:s="http://jboss.org/schema/seam/taglib"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.InactiveAccount']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index b96cfc5bbe..2ea6866d86 100644
--- a/zanata-war/src/main/webapp/account/login.xhtml
+++ b/zanata-war/src/main/webapp/account/login.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.SignIn']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/login_input.xhtml b/zanata-war/src/main/webapp/account/login_input.xhtml
index 50cda310ea..51fea18548 100644
--- a/zanata-war/src/main/webapp/account/login_input.xhtml
+++ b/zanata-war/src/main/webapp/account/login_input.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.SignIn']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/logout.xhtml b/zanata-war/src/main/webapp/account/logout.xhtml
index 0899e2098b..65c51a01c1 100644
--- a/zanata-war/src/main/webapp/account/logout.xhtml
+++ b/zanata-war/src/main/webapp/account/logout.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.Logout']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/password_reset.xhtml b/zanata-war/src/main/webapp/account/password_reset.xhtml
index 8c11ea8af5..dfe21cb855 100644
--- a/zanata-war/src/main/webapp/account/password_reset.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.ResetYourPassword']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/password_reset_request.xhtml b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
index acbfbe8f9c..33e5032b7a 100644
--- a/zanata-war/src/main/webapp/account/password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.ResetPassword']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index eebe55aab7..b9ca81cd03 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -8,7 +8,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.Register']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/account/validate_email.xhtml b/zanata-war/src/main/webapp/account/validate_email.xhtml
index f5d9f8c2d4..71bbfb5406 100644
--- a/zanata-war/src/main/webapp/account/validate_email.xhtml
+++ b/zanata-war/src/main/webapp/account/validate_email.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.ValidateEmail']}</ui:define>
   <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/home.xhtml b/zanata-war/src/main/webapp/admin/home.xhtml
index 826b27c54c..4df18ba195 100644
--- a/zanata-war/src/main/webapp/admin/home.xhtml
+++ b/zanata-war/src/main/webapp/admin/home.xhtml
@@ -6,7 +6,7 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Administration']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/languagemanager.xhtml b/zanata-war/src/main/webapp/admin/languagemanager.xhtml
index 35c688e93c..cbec938ba4 100644
--- a/zanata-war/src/main/webapp/admin/languagemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/languagemanager.xhtml
@@ -8,7 +8,7 @@
 	xmlns:rich="http://richfaces.org/rich"
 	xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-	template="../WEB-INF/layout/template.xhtml">
+	template="../WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{messages['jsf.ManageLanguage']}</ui:define>
 	<ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index 29ad6bb491..dac6707911 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.xhtml
@@ -7,7 +7,7 @@
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.ProcessManager']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index 996bac5ae2..8dacbf759a 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -7,7 +7,7 @@
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:s="http://jboss.org/schema/seam/taglib">
 
-  <ui:composition template="../WEB-INF/layout/template.xhtml">
+  <ui:composition template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{roleAction.role} - #{messages['jsf.RoleDetails']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 711e845aa4..617a35f8ed 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -7,7 +7,7 @@
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:s="http://jboss.org/schema/seam/taglib">
 
-  <ui:composition template="../WEB-INF/layout/template.xhtml">
+  <ui:composition template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.ManageRoles']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index 8ea343fc53..de3bf3d6a3 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -6,7 +6,7 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.rolerules.EditRoleAssignmentRule']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/rolerules.xhtml b/zanata-war/src/main/webapp/admin/rolerules.xhtml
index 0f9856fa09..108a60aa87 100644
--- a/zanata-war/src/main/webapp/admin/rolerules.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolerules.xhtml
@@ -7,7 +7,7 @@
       xmlns:a4j="http://richfaces.org/a4j"
       xmlns:s="http://jboss.org/schema/seam/taglib">
 
-<ui:composition template="../WEB-INF/layout/template.xhtml">
+<ui:composition template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.RoleAssignmentRules']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
index c8d17a60e8..7d8b83d97e 100644
--- a/zanata-war/src/main/webapp/admin/search.xhtml
+++ b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -8,7 +8,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.ManageSearch']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
index c785ea6574..5aa80b4b70 100644
--- a/zanata-war/src/main/webapp/admin/server_configuration.xhtml
+++ b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.ServerConfiguration']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index ba83acd645..ff8f04657c 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Statistics']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml b/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
index e2cc6ea855..db3b29b2f2 100644
--- a/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
@@ -7,7 +7,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:rich="http://richfaces.org/rich"
 	xmlns:a4j="http://richfaces.org/a4j"
-	template="../WEB-INF/layout/template.xhtml">
+	template="../WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{messages['jsf.CreateSupportedLanguage']}</ui:define>
 	<ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index 3c32c67e61..79fe76d346 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -7,7 +7,7 @@
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:s="http://jboss.org/schema/seam/taglib">
 
-  <ui:composition template="../WEB-INF/layout/template.xhtml">
+  <ui:composition template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{userAction.username} - #{messages['jsf.AccountDetails']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index a3791e90c4..059f89217c 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -8,7 +8,7 @@
     xmlns:fn="http://java.sun.com/jsp/jstl/functions"
     xmlns:s="http://jboss.org/schema/seam/taglib">
 
-  <ui:composition template="../WEB-INF/layout/template.xhtml">
+  <ui:composition template="../WEB-INF/template/template.xhtml">
 <!-- disabled since it doesn't create the HPerson to go with the HAccount
     <ui:define name="right_content">
         <s:link action="#{userAction.createUser}"
diff --git a/zanata-war/src/main/webapp/dashboard/home.xhtml b/zanata-war/src/main/webapp/dashboard/home.xhtml
index d21df89637..65eda980b6 100644
--- a/zanata-war/src/main/webapp/dashboard/home.xhtml
+++ b/zanata-war/src/main/webapp/dashboard/home.xhtml
@@ -6,7 +6,7 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
-                template="../WEB-INF/layout/template_v1.xhtml">
+                template="../WEB-INF/template/template_v1.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.PageTitle']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/edit_home_content.xhtml b/zanata-war/src/main/webapp/edit_home_content.xhtml
index 276e32bde1..06ea10a97b 100644
--- a/zanata-war/src/main/webapp/edit_home_content.xhtml
+++ b/zanata-war/src/main/webapp/edit_home_content.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:rich="http://richfaces.org/rich"
-    template="/WEB-INF/layout/template.xhtml">
+    template="/WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.EditHomePage']}</ui:define>
 <ui:define name="center_content" >
diff --git a/zanata-war/src/main/webapp/edit_home_content_code.xhtml b/zanata-war/src/main/webapp/edit_home_content_code.xhtml
index 8fb705c0d7..9ef20a4ad2 100644
--- a/zanata-war/src/main/webapp/edit_home_content_code.xhtml
+++ b/zanata-war/src/main/webapp/edit_home_content_code.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:rich="http://richfaces.org/rich"
-    template="/WEB-INF/layout/template.xhtml">
+    template="/WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.server.EditHomePageCode.label']}</ui:define>
 <ui:define name="center_content" >
diff --git a/zanata-war/src/main/webapp/error.xhtml b/zanata-war/src/main/webapp/error.xhtml
index 51b8bbf6c6..008086e1c1 100644
--- a/zanata-war/src/main/webapp/error.xhtml
+++ b/zanata-war/src/main/webapp/error.xhtml
@@ -5,7 +5,7 @@
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
-    template="WEB-INF/layout/template.xhtml">
+    template="WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Error']}</ui:define>
     <ui:param name="showGlobalMessages" value="false"/>
diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
index 342e493f94..30e368021c 100644
--- a/zanata-war/src/main/webapp/glossary/view.xhtml
+++ b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -7,7 +7,7 @@
 	xmlns:a4j="http://richfaces.org/a4j"
 	xmlns:s="http://jboss.org/schema/seam/taglib">
 
-<ui:composition template="../WEB-INF/layout/template.xhtml">
+<ui:composition template="../WEB-INF/template/template.xhtml">
 
 	<ui:define name="head">
 		<script type="text/javascript">
diff --git a/zanata-war/src/main/webapp/help/contact_admin.xhtml b/zanata-war/src/main/webapp/help/contact_admin.xhtml
index 125308453f..344a0ac1b9 100644
--- a/zanata-war/src/main/webapp/help/contact_admin.xhtml
+++ b/zanata-war/src/main/webapp/help/contact_admin.xhtml
@@ -7,7 +7,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:a4j="http://richfaces.org/a4j"
    xmlns:rich="http://richfaces.org/rich"
-   template="/WEB-INF/layout/template.xhtml">
+   template="/WEB-INF/template/template.xhtml">
 
    <ui:param name="showGlobalMessages" value="true"/>
 
diff --git a/zanata-war/src/main/webapp/help/edit_help_content.xhtml b/zanata-war/src/main/webapp/help/edit_help_content.xhtml
index c309c07512..603a149f2b 100644
--- a/zanata-war/src/main/webapp/help/edit_help_content.xhtml
+++ b/zanata-war/src/main/webapp/help/edit_help_content.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:rich="http://richfaces.org/rich"
-    template="/WEB-INF/layout/template.xhtml">
+    template="/WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.EditHelpPageContent']}</ui:define>
 <ui:define name="center_content" >
diff --git a/zanata-war/src/main/webapp/help/view.xhtml b/zanata-war/src/main/webapp/help/view.xhtml
index 6deab06642..a79ded72ac 100644
--- a/zanata-war/src/main/webapp/help/view.xhtml
+++ b/zanata-war/src/main/webapp/help/view.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="/WEB-INF/layout/template.xhtml">
+    template="/WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.Help']}</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/home.xhtml b/zanata-war/src/main/webapp/home.xhtml
index d5e178163b..fc267e3f97 100644
--- a/zanata-war/src/main/webapp/home.xhtml
+++ b/zanata-war/src/main/webapp/home.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="./WEB-INF/layout/template.xhtml">
+    template="./WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Home']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/iteration/copy_trans.xhtml b/zanata-war/src/main/webapp/iteration/copy_trans.xhtml
index 7e08193d57..21488bcf32 100644
--- a/zanata-war/src/main/webapp/iteration/copy_trans.xhtml
+++ b/zanata-war/src/main/webapp/iteration/copy_trans.xhtml
@@ -7,7 +7,7 @@
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.iteration.CopyTrans.pageTitle']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/iteration/edit.xhtml b/zanata-war/src/main/webapp/iteration/edit.xhtml
index 3a87414a29..d38c7484a5 100644
--- a/zanata-war/src/main/webapp/iteration/edit.xhtml
+++ b/zanata-war/src/main/webapp/iteration/edit.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{projectIterationHome.instance.project.slug}:#{projectIterationHome.instance.slug} - Edit</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/iteration/files.xhtml b/zanata-war/src/main/webapp/iteration/files.xhtml
index 6b719e42a0..f321d706d8 100644
--- a/zanata-war/src/main/webapp/iteration/files.xhtml
+++ b/zanata-war/src/main/webapp/iteration/files.xhtml
@@ -9,7 +9,7 @@
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:richext="http://java.sun.com/jsf/composite/richext"
                 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="head">
         <script type="text/javascript">
diff --git a/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml b/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
index 7c6829fe55..530245fe09 100644
--- a/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
+++ b/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
@@ -7,7 +7,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:a4j="http://richfaces.org/a4j"
    xmlns:rich="http://richfaces.org/rich"
-   template="/WEB-INF/layout/template.xhtml">
+   template="/WEB-INF/template/template.xhtml">
 
    <ui:param name="showGlobalMessages" value="true"/>
    
diff --git a/zanata-war/src/main/webapp/iteration/source_files.xhtml b/zanata-war/src/main/webapp/iteration/source_files.xhtml
index 265222e3d8..2e3a2bfe48 100644
--- a/zanata-war/src/main/webapp/iteration/source_files.xhtml
+++ b/zanata-war/src/main/webapp/iteration/source_files.xhtml
@@ -9,7 +9,7 @@
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:richext="http://java.sun.com/jsf/composite/richext"
                 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="head">
         <script type="text/javascript">
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 34c1b5c4b7..5b41218171 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -7,7 +7,7 @@
 	xmlns:rich="http://richfaces.org/rich"
 	xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-	template="../WEB-INF/layout/template.xhtml">
+	template="../WEB-INF/template/template.xhtml">
 
 
     <ui:define name="page_title">#{viewAllStatusAction.projectSlug}:#{viewAllStatusAction.iterationSlug}</ui:define>
diff --git a/zanata-war/src/main/webapp/language/contact_coordinator.xhtml b/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
index f38e8b3a41..cb2ac8eea1 100644
--- a/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
+++ b/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
@@ -7,7 +7,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:a4j="http://richfaces.org/a4j"
    xmlns:rich="http://richfaces.org/rich"
-   template="/WEB-INF/layout/template.xhtml">
+   template="/WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{messages['jsf.email.ContactCoordinatorTitle']}</ui:define>
    <ui:param name="showGlobalMessages" value="true"/>
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index f351ee6fda..af46e955f1 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/home.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Languages']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index d06592256a..3e85a42b86 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.LanguageTeamTitle']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml b/zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
index a2036f729f..70fe2c8860 100644
--- a/zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
+++ b/zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
@@ -7,7 +7,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:a4j="http://richfaces.org/a4j"
    xmlns:rich="http://richfaces.org/rich"
-   template="/WEB-INF/layout/template.xhtml">
+   template="/WEB-INF/template/template.xhtml">
 
    <ui:param name="showGlobalMessages" value="true"/>
 
diff --git a/zanata-war/src/main/webapp/profile/add_identity.xhtml b/zanata-war/src/main/webapp/profile/add_identity.xhtml
index 802cbb090b..3de6c0cd59 100644
--- a/zanata-war/src/main/webapp/profile/add_identity.xhtml
+++ b/zanata-war/src/main/webapp/profile/add_identity.xhtml
@@ -5,7 +5,7 @@
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:s="http://jboss.org/schema/seam/taglib"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.identities.AddIdentity']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/profile/edit.xhtml b/zanata-war/src/main/webapp/profile/edit.xhtml
index dde650c700..20f1b52111 100644
--- a/zanata-war/src/main/webapp/profile/edit.xhtml
+++ b/zanata-war/src/main/webapp/profile/edit.xhtml
@@ -5,7 +5,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
 	xmlns:s="http://jboss.org/schema/seam/taglib"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.EditProfile']}</ui:define>
     <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/profile/identities.xhtml b/zanata-war/src/main/webapp/profile/identities.xhtml
index e8d1c2652a..baac078662 100644
--- a/zanata-war/src/main/webapp/profile/identities.xhtml
+++ b/zanata-war/src/main/webapp/profile/identities.xhtml
@@ -5,7 +5,7 @@
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:s="http://jboss.org/schema/seam/taglib"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.identities.Title']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/profile/merge_account.xhtml b/zanata-war/src/main/webapp/profile/merge_account.xhtml
index 8ba5ed6f59..b1c19df5b6 100644
--- a/zanata-war/src/main/webapp/profile/merge_account.xhtml
+++ b/zanata-war/src/main/webapp/profile/merge_account.xhtml
@@ -5,7 +5,7 @@
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
                 xmlns:s="http://jboss.org/schema/seam/taglib"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.profile.MergeAccount']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/profile/view.xhtml b/zanata-war/src/main/webapp/profile/view.xhtml
index 9e0dc4ac26..505f55a844 100644
--- a/zanata-war/src/main/webapp/profile/view.xhtml
+++ b/zanata-war/src/main/webapp/profile/view.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml"
+    template="../WEB-INF/template/template.xhtml"
     >
 
     <ui:define name="page_title">#{messages['jsf.MyProfile']}</ui:define>
diff --git a/zanata-war/src/main/webapp/project/add_iteration.xhtml b/zanata-war/src/main/webapp/project/add_iteration.xhtml
index 41ca294748..0531cd7cb3 100644
--- a/zanata-war/src/main/webapp/project/add_iteration.xhtml
+++ b/zanata-war/src/main/webapp/project/add_iteration.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{projectIterationHome.instance.project.name} - Add Version</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/project/assign_maintainer.xhtml b/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
index 6636673b3a..a0a8589fe9 100644
--- a/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
+++ b/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
    
     <ui:define name="page_title">#{projectHome.instance.name}:#{messages['jsf.AddProjectMaintainer']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/project/copy_trans_options.xhtml b/zanata-war/src/main/webapp/project/copy_trans_options.xhtml
index 91a7da3668..32cc472990 100644
--- a/zanata-war/src/main/webapp/project/copy_trans_options.xhtml
+++ b/zanata-war/src/main/webapp/project/copy_trans_options.xhtml
@@ -7,7 +7,7 @@
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:rich="http://richfaces.org/rich"
                 xmlns:a4j="http://richfaces.org/a4j"
-                template="../WEB-INF/layout/template.xhtml">
+                template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{projectHome.instance.name}:#{messages['jsf.project.CopyTransOpts.title']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/project/create_project.xhtml b/zanata-war/src/main/webapp/project/create_project.xhtml
index 19a68b7f6f..14de7a046a 100644
--- a/zanata-war/src/main/webapp/project/create_project.xhtml
+++ b/zanata-war/src/main/webapp/project/create_project.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">Create Project</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/project/edit.xhtml b/zanata-war/src/main/webapp/project/edit.xhtml
index adfc812055..d3aaa3efa4 100644
--- a/zanata-war/src/main/webapp/project/edit.xhtml
+++ b/zanata-war/src/main/webapp/project/edit.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{projectHome.instance.name} - Edit</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index a442af6494..c50fe5c93d 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -8,7 +8,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
   <ui:define name="page_title">#{messages['jsf.Projects']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/project/homepage_edit.xhtml b/zanata-war/src/main/webapp/project/homepage_edit.xhtml
index 98605e1854..28400d43bc 100644
--- a/zanata-war/src/main/webapp/project/homepage_edit.xhtml
+++ b/zanata-war/src/main/webapp/project/homepage_edit.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{projectHome.instance.name} - Edit Home</ui:define>
 	<ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 5b042f7fca..18c2784ecd 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -9,7 +9,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{projectHome.instance.name}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/search.xhtml b/zanata-war/src/main/webapp/search.xhtml
index 84f6e4fe01..b4027ec8b4 100644
--- a/zanata-war/src/main/webapp/search.xhtml
+++ b/zanata-war/src/main/webapp/search.xhtml
@@ -5,7 +5,7 @@
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:rich="http://richfaces.org/rich" template="./WEB-INF/layout/template.xhtml">
+	xmlns:rich="http://richfaces.org/rich" template="./WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{messages['jsf.SearchResultsForProjectSearch']}</ui:define>
 	<ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml b/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
index 17248edd79..91c7017c6a 100644
--- a/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
+++ b/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
@@ -7,7 +7,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupMaintainerManageAction.group.name}:#{messages['jsf.ManageMaintainers']}</ui:define>
     <ui:define name="right_content">
diff --git a/zanata-war/src/main/webapp/version-group/create_version_group.xhtml b/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
index 9ad816ed88..2805007098 100644
--- a/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
@@ -7,7 +7,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:rich="http://richfaces.org/rich"
 	xmlns:a4j="http://richfaces.org/a4j"
-	template="../WEB-INF/layout/template.xhtml">
+	template="../WEB-INF/template/template.xhtml">
 
    <ui:define name="page_title">#{messages['jsf.Groups']}:#{messages['jsf.CreateNewGroup']}</ui:define>
 	<ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/version-group/edit.xhtml b/zanata-war/src/main/webapp/version-group/edit.xhtml
index 34286a7b27..c39fd58572 100644
--- a/zanata-war/src/main/webapp/version-group/edit.xhtml
+++ b/zanata-war/src/main/webapp/version-group/edit.xhtml
@@ -6,7 +6,7 @@
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:rich="http://richfaces.org/rich"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name} - #{messages['jsf.Edit']}</ui:define>
 <ui:define name="center_content">
diff --git a/zanata-war/src/main/webapp/version-group/home.xhtml b/zanata-war/src/main/webapp/version-group/home.xhtml
index 63bf35e1fc..368fed3991 100644
--- a/zanata-war/src/main/webapp/version-group/home.xhtml
+++ b/zanata-war/src/main/webapp/version-group/home.xhtml
@@ -8,7 +8,7 @@
     xmlns:s="http://jboss.org/schema/seam/taglib"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
     xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
     <ui:define name="page_title">#{messages['jsf.Groups']}</ui:define>
 
diff --git a/zanata-war/src/main/webapp/version-group/request_to_join.xhtml b/zanata-war/src/main/webapp/version-group/request_to_join.xhtml
index 794e785ab8..6adac87f48 100644
--- a/zanata-war/src/main/webapp/version-group/request_to_join.xhtml
+++ b/zanata-war/src/main/webapp/version-group/request_to_join.xhtml
@@ -5,7 +5,7 @@
    xmlns:ui="http://java.sun.com/jsf/facelets"
    xmlns:f="http://java.sun.com/jsf/core"
    xmlns:rich="http://richfaces.org/rich"
-   template="/WEB-INF/layout/template.xhtml">
+   template="/WEB-INF/template/template.xhtml">
 
    <ui:param name="showGlobalMessages" value="true"/>
    
diff --git a/zanata-war/src/main/webapp/version-group/version_group.xhtml b/zanata-war/src/main/webapp/version-group/version_group.xhtml
index b4e1d9ef40..b6bdb745b1 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -8,7 +8,7 @@
     xmlns:rich="http://richfaces.org/rich"
     xmlns:a4j="http://richfaces.org/a4j"
     xmlns:richext="http://java.sun.com/jsf/composite/richext"
-    template="../WEB-INF/layout/template.xhtml">
+    template="../WEB-INF/template/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name}</ui:define>