From 7e60c526b271393336bb22586feb10ac7f827151 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 16:48:08 +0200
Subject: [PATCH] Moved generic templates/page files to sub folders for
 re-organization.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 nbproject/faces-config.NavData                | 92 +++++++++----------
 web/WEB-INF/faces-config.xml                  | 74 +++++++--------
 .../{ => cellphone}/admin_cellphone_data.tpl  |  2 +-
 .../{ => cellphone}/admin_cellphone_links.tpl |  0
 .../{ => country}/admin_form_country_data.tpl |  0
 .../admin_form_mobile_provider.tpl            |  0
 .../admin_form_user_personal_data.tpl}        |  0
 .../admin/{ => user}/admin_user_links.tpl     |  0
 .../admin_contact_cellphone_delete.xhtml      |  0
 .../admin_contact_cellphone_edit.xhtml        |  0
 .../admin_contact_cellphone_list.xhtml        |  0
 .../admin_contact_cellphone_show.xhtml        |  2 +-
 .../admin_contact_cellphone_unlink.xhtml      |  0
 .../{ => contact}/admin_contact_show.xhtml    |  0
 .../{ => country}/admin_country_delete.xhtml  |  0
 .../{ => country}/admin_country_edit.xhtml    |  0
 .../{ => country}/admin_country_list.xhtml    |  2 +-
 .../admin_mobile_provider_delete.xhtml        |  0
 .../admin_mobile_provider_edit.xhtml          |  0
 .../admin_mobile_provider_list.xhtml          |  2 +-
 .../admin_mobile_provider_show.xhtml          |  0
 web/admin/{ => user}/admin_user_delete.xhtml  |  0
 web/admin/{ => user}/admin_user_edit.xhtml    |  0
 web/admin/{ => user}/admin_user_list.xhtml    |  2 +-
 web/admin/{ => user}/admin_user_show.xhtml    |  4 +-
 web/admin/{ => user}/admin_user_unlock.xhtml  |  0
 26 files changed, 88 insertions(+), 92 deletions(-)
 rename web/WEB-INF/templates/admin/{ => cellphone}/admin_cellphone_data.tpl (96%)
 rename web/WEB-INF/templates/admin/{ => cellphone}/admin_cellphone_links.tpl (100%)
 rename web/WEB-INF/templates/admin/{ => country}/admin_form_country_data.tpl (100%)
 rename web/WEB-INF/templates/admin/{ => mobile_provider}/admin_form_mobile_provider.tpl (100%)
 rename web/WEB-INF/templates/admin/{admin_form_personal_data.tpl => user/admin_form_user_personal_data.tpl} (100%)
 rename web/WEB-INF/templates/admin/{ => user}/admin_user_links.tpl (100%)
 rename web/admin/{ => cellphone}/admin_contact_cellphone_delete.xhtml (100%)
 rename web/admin/{ => cellphone}/admin_contact_cellphone_edit.xhtml (100%)
 rename web/admin/{ => cellphone}/admin_contact_cellphone_list.xhtml (100%)
 rename web/admin/{ => cellphone}/admin_contact_cellphone_show.xhtml (97%)
 rename web/admin/{ => cellphone}/admin_contact_cellphone_unlink.xhtml (100%)
 rename web/admin/{ => contact}/admin_contact_show.xhtml (100%)
 rename web/admin/{ => country}/admin_country_delete.xhtml (100%)
 rename web/admin/{ => country}/admin_country_edit.xhtml (100%)
 rename web/admin/{ => country}/admin_country_list.xhtml (96%)
 rename web/admin/{ => mobile_provider}/admin_mobile_provider_delete.xhtml (100%)
 rename web/admin/{ => mobile_provider}/admin_mobile_provider_edit.xhtml (100%)
 rename web/admin/{ => mobile_provider}/admin_mobile_provider_list.xhtml (96%)
 rename web/admin/{ => mobile_provider}/admin_mobile_provider_show.xhtml (100%)
 rename web/admin/{ => user}/admin_user_delete.xhtml (100%)
 rename web/admin/{ => user}/admin_user_edit.xhtml (100%)
 rename web/admin/{ => user}/admin_user_list.xhtml (97%)
 rename web/admin/{ => user}/admin_user_show.xhtml (98%)
 rename web/admin/{ => user}/admin_user_unlock.xhtml (100%)

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 84f18adc..480e8f98 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,54 +2,54 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/admin_user_delete.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="300" zoom="true"/>
         <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/index.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/admin_country_delete.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_show.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_edit.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/admin_user_show.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="index.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/admin_contact_show.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="*" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/login.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/admin_country_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_delete.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="exception.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/register.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/admin_country_edit.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_delete.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="terms.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="*" x="1900" y="450" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="exception.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/register.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="admin/admin_user_add.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_list.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_list.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/admin_user_unlock.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_show.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_unlink.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="1900" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 04a88f12..756ec0b7 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -91,10 +91,6 @@
 			<from-outcome>user_resend_link</from-outcome>
 			<to-view-id>/user/resend_link.xhtml</to-view-id>
 		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_list</from-outcome>
-			<to-view-id>/user/user_list.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_logout</from-outcome>
 			<to-view-id>/admin/admin_logout.xhtml</to-view-id>
@@ -120,19 +116,19 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
-			<to-view-id>/admin/admin_user_list.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_countries</from-outcome>
-			<to-view-id>/admin/admin_country_list.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_list.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_list.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -209,121 +205,121 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_country_list.xhtml</from-view-id>
+		<from-view-id>/admin/country/admin_country_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_country</from-outcome>
-			<to-view-id>/admin/admin_country_edit.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_country</from-outcome>
-			<to-view-id>/admin/admin_country_delete.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_mobile_provider_list.xhtml</from-view-id>
+		<from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_edit.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_delete.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_list.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_user</from-outcome>
-			<to-view-id>/admin/admin_user_show.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_show.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_show.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_show.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_contact_cellphone_list.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_show.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_contact_cellphone_show.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
-			<to-view-id>/admin/admin_contact_show.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<!--
diff --git a/web/WEB-INF/templates/admin/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
similarity index 96%
rename from web/WEB-INF/templates/admin/admin_cellphone_data.tpl
rename to web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 030d3528..f1aedf31 100644
--- a/web/WEB-INF/templates/admin/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -37,7 +37,7 @@
 			<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
 
 			<div id="cellphoneLinks" class="data_field">
-				<ui:include src="/WEB-INF/templates/admin/admin_cellphone_links.tpl">
+				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
 					<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
 					<ui:param name="contact" value="#{user.userContact}" />
 					<ui:param name="isShowPage" value="#{isShowPage}" />
diff --git a/web/WEB-INF/templates/admin/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_cellphone_links.tpl
rename to web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
diff --git a/web/WEB-INF/templates/admin/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_form_country_data.tpl
rename to web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
diff --git a/web/WEB-INF/templates/admin/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_form_mobile_provider.tpl
rename to web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
diff --git a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_form_personal_data.tpl
rename to web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
diff --git a/web/WEB-INF/templates/admin/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
similarity index 100%
rename from web/WEB-INF/templates/admin/admin_user_links.tpl
rename to web/WEB-INF/templates/admin/user/admin_user_links.tpl
diff --git a/web/admin/admin_contact_cellphone_delete.xhtml b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml
similarity index 100%
rename from web/admin/admin_contact_cellphone_delete.xhtml
rename to web/admin/cellphone/admin_contact_cellphone_delete.xhtml
diff --git a/web/admin/admin_contact_cellphone_edit.xhtml b/web/admin/cellphone/admin_contact_cellphone_edit.xhtml
similarity index 100%
rename from web/admin/admin_contact_cellphone_edit.xhtml
rename to web/admin/cellphone/admin_contact_cellphone_edit.xhtml
diff --git a/web/admin/admin_contact_cellphone_list.xhtml b/web/admin/cellphone/admin_contact_cellphone_list.xhtml
similarity index 100%
rename from web/admin/admin_contact_cellphone_list.xhtml
rename to web/admin/cellphone/admin_contact_cellphone_list.xhtml
diff --git a/web/admin/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
similarity index 97%
rename from web/admin/admin_contact_cellphone_show.xhtml
rename to web/admin/cellphone/admin_contact_cellphone_show.xhtml
index 5997f1a7..fc8483a8 100644
--- a/web/admin/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -18,7 +18,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:include src="/WEB-INF/templates/admin/admin_cellphone_data.tpl">
+			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
 				<ui:param name="cellphoneNumber" value="#{adminContactPhoneController.cellPhone}" />
 				<ui:param name="isShowPage" value="#{true}" />
 			</ui:include>
diff --git a/web/admin/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
similarity index 100%
rename from web/admin/admin_contact_cellphone_unlink.xhtml
rename to web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
diff --git a/web/admin/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
similarity index 100%
rename from web/admin/admin_contact_show.xhtml
rename to web/admin/contact/admin_contact_show.xhtml
diff --git a/web/admin/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
similarity index 100%
rename from web/admin/admin_country_delete.xhtml
rename to web/admin/country/admin_country_delete.xhtml
diff --git a/web/admin/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
similarity index 100%
rename from web/admin/admin_country_edit.xhtml
rename to web/admin/country/admin_country_edit.xhtml
diff --git a/web/admin/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
similarity index 96%
rename from web/admin/admin_country_list.xhtml
rename to web/admin/country/admin_country_list.xhtml
index c051c3dc..87a8347b 100644
--- a/web/admin/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -48,7 +48,7 @@
 						#{msg.ADMIN_ADD_COUNTRY_TITLE}
 					</div>
 
-					<ui:include src="/WEB-INF/templates/admin/admin_form_country_data.tpl" />
+					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
similarity index 100%
rename from web/admin/admin_mobile_provider_delete.xhtml
rename to web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
diff --git a/web/admin/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
similarity index 100%
rename from web/admin/admin_mobile_provider_edit.xhtml
rename to web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
diff --git a/web/admin/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
similarity index 96%
rename from web/admin/admin_mobile_provider_list.xhtml
rename to web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index c9222ce2..61d50717 100644
--- a/web/admin/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -56,7 +56,7 @@
 						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
 					</div>
 
-					<ui:include src="/WEB-INF/templates/admin/admin_form_mobile_provider.tpl" />
+					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
similarity index 100%
rename from web/admin/admin_mobile_provider_show.xhtml
rename to web/admin/mobile_provider/admin_mobile_provider_show.xhtml
diff --git a/web/admin/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
similarity index 100%
rename from web/admin/admin_user_delete.xhtml
rename to web/admin/user/admin_user_delete.xhtml
diff --git a/web/admin/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
similarity index 100%
rename from web/admin/admin_user_edit.xhtml
rename to web/admin/user/admin_user_edit.xhtml
diff --git a/web/admin/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
similarity index 97%
rename from web/admin/admin_user_list.xhtml
rename to web/admin/user/admin_user_list.xhtml
index 01cb96dd..61f18a82 100644
--- a/web/admin/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -74,7 +74,7 @@
 						#{msg.ADMIN_ADD_USER_TITLE}
 					</div>
 
-					<ui:include src="/WEB-INF/templates/admin/admin_form_personal_data.tpl" />
+					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
similarity index 98%
rename from web/admin/admin_user_show.xhtml
rename to web/admin/user/admin_user_show.xhtml
index dff90801..7856af2f 100644
--- a/web/admin/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -169,11 +169,11 @@
 				</h:column>
 			</h:panelGrid>
 
-			<ui:include src="/WEB-INF/templates/admin/admin_user_links.tpl">
+			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
 				<ui:param name="user" value="#{userController.user}" />
 			</ui:include>
 
-			<ui:include src="/WEB-INF/templates/admin/admin_cellphone_data.tpl">
+			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
 				<ui:param name="cellphoneNumber" value="#{userController.user.userContact.contactCellphoneNumber}" />
 				<ui:param name="user" value="#{userController.user}" />
 			</ui:include>
diff --git a/web/admin/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
similarity index 100%
rename from web/admin/admin_user_unlock.xhtml
rename to web/admin/user/admin_user_unlock.xhtml
-- 
2.39.5