From 2c1b3426a2f004cc6844a706e2c145e21d86cc41 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Tue, 24 Mar 2015 19:27:18 +0000
Subject: [PATCH]

---
 .../web/views/allowedPolicyValue/create.xhtml          |  2 +-
 .../allowedPolicyValueCreatePanelGrid.xhtml            |  1 -
 .../allowedPolicyValueDestroyDialog.xhtml              |  0
 .../allowedPolicyValueListDataTable.xhtml              |  0
 .../allowedPolicyValueListEditDataTable.xhtml          |  2 +-
 src/java/DmWebPortal/web/views/experiment/create.xhtml |  2 +-
 src/java/DmWebPortal/web/views/experiment/edit.xhtml   | 10 +++++-----
 src/java/DmWebPortal/web/views/experiment/list.xhtml   |  4 ++--
 .../{ => private}/experimentCreatePanelGrid.xhtml      |  0
 .../{ => private}/experimentDestroyDialog.xhtml        |  1 -
 .../{ => private}/experimentEditPanelGrid.xhtml        |  0
 .../{ => private}/experimentListDataTable.xhtml        |  0
 .../experimentPoliciesEditSelection.xhtml              |  0
 .../experimentPoliciesViewListDataTable.xhtml          |  0
 .../{ => private}/experimentPolicyAddDialog.xhtml      |  0
 .../{ => private}/experimentPolicyRemoveDialog.xhtml   |  0
 .../{ => private}/experimentUserAddDialog.xhtml        |  0
 .../{ => private}/experimentUserRemoveDialog.xhtml     |  0
 .../{ => private}/experimentUsersEditDataTable.xhtml   |  0
 .../{ => private}/experimentUsersListDataTable.xhtml   |  0
 .../{ => private}/experimentViewPanelGrid.xhtml        |  0
 src/java/DmWebPortal/web/views/experiment/view.xhtml   |  6 +++---
 .../DmWebPortal/web/views/experimentType/create.xhtml  |  2 +-
 .../DmWebPortal/web/views/experimentType/edit.xhtml    |  2 +-
 .../DmWebPortal/web/views/experimentType/list.xhtml    |  4 ++--
 .../{ => private}/experimentTypeCreatePanelGrid.xhtml  |  0
 .../{ => private}/experimentTypeDestroyDialog.xhtml    |  0
 .../{ => private}/experimentTypeEditPanelGrid.xhtml    |  0
 .../{ => private}/experimentTypeListDataTable.xhtml    |  0
 .../{ => private}/experimentTypeViewPanelGrid.xhtml    |  0
 .../DmWebPortal/web/views/experimentType/view.xhtml    |  4 ++--
 .../DmWebPortal/web/views/policyProperty/create.xhtml  |  2 +-
 .../DmWebPortal/web/views/policyProperty/edit.xhtml    |  4 ++--
 .../{ => private}/policyPropertyCreatePanelGrid.xhtml  |  0
 .../{ => private}/policyPropertyDestroyDialog.xhtml    |  0
 .../{ => private}/policyPropertyEditPanelGrid.xhtml    |  0
 .../{ => private}/policyPropertyListDataTable.xhtml    |  0
 .../policyPropertyListEditDataTable.xhtml              |  0
 .../{ => private}/policyPropertyViewPanelGrid.xhtml    |  0
 .../DmWebPortal/web/views/policyProperty/view.xhtml    |  4 ++--
 src/java/DmWebPortal/web/views/policyType/edit.xhtml   |  4 ++--
 src/java/DmWebPortal/web/views/policyType/list.xhtml   |  2 +-
 .../{ => private}/policyTypeEditPanelGrid.xhtml        |  0
 .../{ => private}/policyTypeListDataTable.xhtml        |  0
 .../{ => private}/policyTypeViewPanelGrid.xhtml        |  0
 src/java/DmWebPortal/web/views/policyType/view.xhtml   |  4 ++--
 src/java/DmWebPortal/web/views/roleType/edit.xhtml     |  2 +-
 src/java/DmWebPortal/web/views/roleType/list.xhtml     |  2 +-
 .../{ => private}/roleTypeCreatePanelGrid.xhtml        |  0
 .../roleType/{ => private}/roleTypeEditPanelGrid.xhtml |  0
 .../roleType/{ => private}/roleTypeListDataTable.xhtml |  0
 .../roleType/{ => private}/roleTypeViewPanelGrid.xhtml |  0
 src/java/DmWebPortal/web/views/roleType/view.xhtml     |  2 +-
 src/java/DmWebPortal/web/views/userInfo/create.xhtml   |  2 +-
 src/java/DmWebPortal/web/views/userInfo/edit.xhtml     |  2 +-
 src/java/DmWebPortal/web/views/userInfo/list.xhtml     |  4 ++--
 .../{ => private}/userExperimentsListDataTable.xhtml   |  0
 .../{ => private}/userInfoCreatePanelGrid.xhtml        |  0
 .../userInfo/{ => private}/userInfoDestroyDialog.xhtml |  0
 .../userInfo/{ => private}/userInfoEditPanelGrid.xhtml |  0
 .../userInfo/{ => private}/userInfoListDataTable.xhtml |  0
 .../userInfo/{ => private}/userInfoViewPanelGrid.xhtml |  0
 src/java/DmWebPortal/web/views/userInfo/view.xhtml     |  6 +++---
 .../DmWebPortal/web/views/userSystemRole/list.xhtml    |  6 +++---
 .../{ => private}/systemRoleAddDialog.xhtml            |  0
 .../{ => private}/systemRoleListDataTable.xhtml        |  0
 .../{ => private}/systemRoleRemoveDialog.xhtml         |  0
 67 files changed, 42 insertions(+), 44 deletions(-)
 rename src/java/DmWebPortal/web/views/allowedPolicyValue/{ => private}/allowedPolicyValueCreatePanelGrid.xhtml (99%)
 rename src/java/DmWebPortal/web/views/allowedPolicyValue/{ => private}/allowedPolicyValueDestroyDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/allowedPolicyValue/{ => private}/allowedPolicyValueListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/allowedPolicyValue/{ => private}/allowedPolicyValueListEditDataTable.xhtml (99%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentCreatePanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentDestroyDialog.xhtml (99%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentPoliciesEditSelection.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentPoliciesViewListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentPolicyAddDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentPolicyRemoveDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentUserAddDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentUserRemoveDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentUsersEditDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentUsersListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experiment/{ => private}/experimentViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experimentType/{ => private}/experimentTypeCreatePanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experimentType/{ => private}/experimentTypeDestroyDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experimentType/{ => private}/experimentTypeEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experimentType/{ => private}/experimentTypeListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/experimentType/{ => private}/experimentTypeViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyCreatePanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyDestroyDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyListEditDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyProperty/{ => private}/policyPropertyViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyType/{ => private}/policyTypeEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyType/{ => private}/policyTypeListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/policyType/{ => private}/policyTypeViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/roleType/{ => private}/roleTypeCreatePanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/roleType/{ => private}/roleTypeEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/roleType/{ => private}/roleTypeListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/roleType/{ => private}/roleTypeViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userExperimentsListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userInfoCreatePanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userInfoDestroyDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userInfoEditPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userInfoListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userInfo/{ => private}/userInfoViewPanelGrid.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userSystemRole/{ => private}/systemRoleAddDialog.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userSystemRole/{ => private}/systemRoleListDataTable.xhtml (100%)
 rename src/java/DmWebPortal/web/views/userSystemRole/{ => private}/systemRoleRemoveDialog.xhtml (100%)

diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml
index 8c60655e..29a11f19 100644
--- a/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml
+++ b/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml
@@ -21,7 +21,7 @@
 
         <h:form id="addAllowedPolicyValueForm">
 
-            <ui:include src="allowedPolicyValueCreatePanelGrid.xhtml"/>
+            <ui:include src="private/allowedPolicyValueCreatePanelGrid.xhtml"/>
 
             <p/>
             <div class="actionButton">
diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueCreatePanelGrid.xhtml
similarity index 99%
rename from src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueCreatePanelGrid.xhtml
index e684aa68..6505933f 100644
--- a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueCreatePanelGrid.xhtml
@@ -19,4 +19,3 @@
 
 </ui:composition>
 
-
diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueDestroyDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueDestroyDialog.xhtml
rename to src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueDestroyDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListDataTable.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListEditDataTable.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueListEditDataTable.xhtml
similarity index 99%
rename from src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListEditDataTable.xhtml
rename to src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueListEditDataTable.xhtml
index 8a643352..d589e947 100644
--- a/src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListEditDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/allowedPolicyValue/private/allowedPolicyValueListEditDataTable.xhtml
@@ -53,4 +53,4 @@ and open the template in the editor.
         </p:column>
     </p:dataTable>
                 <ui:include src="allowedPolicyValueDestroyDialog.xhtml"/>
-</ui:composition>
+</ui:composition>
\ No newline at end of file
diff --git a/src/java/DmWebPortal/web/views/experiment/create.xhtml b/src/java/DmWebPortal/web/views/experiment/create.xhtml
index 8f7a6432..88d2abfb 100644
--- a/src/java/DmWebPortal/web/views/experiment/create.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/create.xhtml
@@ -19,7 +19,7 @@
 
         <h:form id="addExperimentForm">
 
-            <ui:include src="experimentCreatePanelGrid.xhtml"/>
+            <ui:include src="private/experimentCreatePanelGrid.xhtml"/>
 
             <p/>
             <div class="actionButton">
diff --git a/src/java/DmWebPortal/web/views/experiment/edit.xhtml b/src/java/DmWebPortal/web/views/experiment/edit.xhtml
index d9f4da35..fa996446 100644
--- a/src/java/DmWebPortal/web/views/experiment/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/edit.xhtml
@@ -25,16 +25,16 @@
                 <p:tab title="Experiment Properties" id="detailsTab" >
 
                     <div class="middleCenterLeftContent">
-                        <ui:include src="experimentEditPanelGrid.xhtml"/>
+                        <ui:include src="private/experimentEditPanelGrid.xhtml"/>
                     </div>
                 </p:tab>
                 
                 <p:tab title="Experiment Policies">
-                    <ui:include src="experimentPoliciesEditSelection.xhtml"/>                   
+                    <ui:include src="private/experimentPoliciesEditSelection.xhtml"/>                   
                 </p:tab>
 
                 <p:tab title="Experiment Users" id="usersTab">                
-                    <ui:include src="experimentUsersEditDataTable.xhtml"/>
+                    <ui:include src="private/experimentUsersEditDataTable.xhtml"/>
                 </p:tab>
             </p:accordionPanel>
                 
@@ -44,8 +44,8 @@
                     <p:commandButton action="#{experimentController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
                 </div>
 
-                <ui:include src="experimentUserRemoveDialog.xhtml" />
-                <ui:include src="experimentPolicyRemoveDialog.xhtml" />
+                <ui:include src="private/experimentUserRemoveDialog.xhtml" />
+                <ui:include src="private/experimentPolicyRemoveDialog.xhtml" />
          </h:form>
     </ui:define>
     </ui:composition>
diff --git a/src/java/DmWebPortal/web/views/experiment/list.xhtml b/src/java/DmWebPortal/web/views/experiment/list.xhtml
index 15e061d0..4bc18cd6 100644
--- a/src/java/DmWebPortal/web/views/experiment/list.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/list.xhtml
@@ -21,10 +21,10 @@
             <ui:include src="../common/commonListActionButtons.xhtml"/>
 
             <h:panelGroup>  
-                <ui:include src="experimentListDataTable.xhtml"/>
+                <ui:include src="private/experimentListDataTable.xhtml"/>
             </h:panelGroup>
 
-            <ui:include src="experimentDestroyDialog.xhtml"/>
+            <ui:include src="private/experimentDestroyDialog.xhtml"/>
 
         </h:form>
 
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentDestroyDialog.xhtml
similarity index 99%
rename from src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentDestroyDialog.xhtml
index d8272096..643b556a 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentDestroyDialog.xhtml
@@ -12,4 +12,3 @@
     </p:confirmDialog>  
 </ui:composition>
 
-
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentPoliciesEditSelection.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentPoliciesEditSelection.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentPoliciesEditSelection.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentPoliciesEditSelection.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentPoliciesViewListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentPoliciesViewListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentPoliciesViewListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentPoliciesViewListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentPolicyAddDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentPolicyAddDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentPolicyAddDialog.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentPolicyAddDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentPolicyRemoveDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentPolicyRemoveDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentPolicyRemoveDialog.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentPolicyRemoveDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentUserAddDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentUserAddDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentUserAddDialog.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentUserAddDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentUserRemoveDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentUserRemoveDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentUserRemoveDialog.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentUserRemoveDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentUsersEditDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentUsersEditDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentUsersEditDataTable.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentUsersEditDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentUsersListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentUsersListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentUsersListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentUsersListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experiment/experimentViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experiment/view.xhtml b/src/java/DmWebPortal/web/views/experiment/view.xhtml
index 8791d3c5..7840f741 100644
--- a/src/java/DmWebPortal/web/views/experiment/view.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/view.xhtml
@@ -23,14 +23,14 @@
             <p:accordionPanel multiple="true" activeIndex="0,1,2" >
                 <p:tab title="Experiment Properties">
                     <div class="middleCenterLeftContent">
-                        <ui:include src="experimentViewPanelGrid.xhtml"/>
+                        <ui:include src="private/experimentViewPanelGrid.xhtml"/>
                     </div>
                 </p:tab>
                  <p:tab title="Experiment Policies">                
-                    <ui:include src="experimentPoliciesViewListDataTable.xhtml"/>
+                    <ui:include src="private/experimentPoliciesViewListDataTable.xhtml"/>
                 </p:tab>               
                 <p:tab title="Experiment Users">                
-                    <ui:include src="experimentUsersListDataTable.xhtml"/>
+                    <ui:include src="private/experimentUsersListDataTable.xhtml"/>
                 </p:tab>
             </p:accordionPanel>
 
diff --git a/src/java/DmWebPortal/web/views/experimentType/create.xhtml b/src/java/DmWebPortal/web/views/experimentType/create.xhtml
index f155bf5f..24762b30 100644
--- a/src/java/DmWebPortal/web/views/experimentType/create.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/create.xhtml
@@ -19,7 +19,7 @@
 
         <h:form id="addExperimentTypeForm">
 
-            <ui:include src="experimentTypeCreatePanelGrid.xhtml"/>
+            <ui:include src="private/experimentTypeCreatePanelGrid.xhtml"/>
 
             <p/>
             <div class="actionButton">
diff --git a/src/java/DmWebPortal/web/views/experimentType/edit.xhtml b/src/java/DmWebPortal/web/views/experimentType/edit.xhtml
index a2a17c58..2503e36e 100644
--- a/src/java/DmWebPortal/web/views/experimentType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/edit.xhtml
@@ -21,7 +21,7 @@
                     <h1>Edit Experiment Type</h1>
                 </div>
 
-                <ui:include src="experimentTypeEditPanelGrid.xhtml"/>
+                <ui:include src="private/experimentTypeEditPanelGrid.xhtml"/>
                 <p/>
                 <div class="actionButton">
                     <p:commandButton action="#{experimentTypeController.update()}" value="Save" alt="Save" icon="ui-icon-check"/>
diff --git a/src/java/DmWebPortal/web/views/experimentType/list.xhtml b/src/java/DmWebPortal/web/views/experimentType/list.xhtml
index 34dce360..9865e5fd 100644
--- a/src/java/DmWebPortal/web/views/experimentType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/list.xhtml
@@ -21,10 +21,10 @@
             <ui:include src="../common/commonListActionButtons.xhtml"/>
 
             <h:panelGroup>  
-                <ui:include src="experimentTypeListDataTable.xhtml"/>
+                <ui:include src="private/experimentTypeListDataTable.xhtml"/>
             </h:panelGroup>
 
-            <ui:include src="experimentTypeDestroyDialog.xhtml"/>
+            <ui:include src="private/experimentTypeDestroyDialog.xhtml"/>
 
         </h:form>
 
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/private/experimentTypeCreatePanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experimentType/private/experimentTypeCreatePanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experimentType/private/experimentTypeDestroyDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
rename to src/java/DmWebPortal/web/views/experimentType/private/experimentTypeDestroyDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/private/experimentTypeEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experimentType/private/experimentTypeEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/experimentType/private/experimentTypeListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/experimentType/private/experimentTypeListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/private/experimentTypeViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/experimentType/private/experimentTypeViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/experimentType/view.xhtml b/src/java/DmWebPortal/web/views/experimentType/view.xhtml
index 53bc135a..ab717c73 100644
--- a/src/java/DmWebPortal/web/views/experimentType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/view.xhtml
@@ -20,7 +20,7 @@
                     <h1>Experiment Type Details</h1>
                 </div>
 
-                <ui:include src="experimentTypeViewPanelGrid.xhtml"/>
+                <ui:include src="private/experimentTypeViewPanelGrid.xhtml"/>
 
                 <p/>
                 <ui:param name="experimentTypeObject" value="#{experimentTypeController.selected}"/>
@@ -32,7 +32,7 @@
                     <p:commandButton action="#{experimentTypeController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
                 </div>
 
-                <ui:include src="experimentTypeDestroyDialog.xhtml"/>
+                <ui:include src="private/experimentTypeDestroyDialog.xhtml"/>
 
             </div>
 
diff --git a/src/java/DmWebPortal/web/views/policyProperty/create.xhtml b/src/java/DmWebPortal/web/views/policyProperty/create.xhtml
index b251e6ff..586d1aaa 100644
--- a/src/java/DmWebPortal/web/views/policyProperty/create.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/create.xhtml
@@ -19,7 +19,7 @@
 
         <h:form id="addPolicyPropertyForm">
 
-            <ui:include src="policyPropertyCreatePanelGrid.xhtml"/>
+            <ui:include src="private/policyPropertyCreatePanelGrid.xhtml"/>
 
             <p/>
             <div class="actionButton">
diff --git a/src/java/DmWebPortal/web/views/policyProperty/edit.xhtml b/src/java/DmWebPortal/web/views/policyProperty/edit.xhtml
index 90d8b375..db9f111d 100644
--- a/src/java/DmWebPortal/web/views/policyProperty/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/edit.xhtml
@@ -26,12 +26,12 @@
                     <p:accordionPanel multiple="true" activeIndex="0,1" >
                         <p:tab title="Policy Property Description">
                             <div class="middleCenterLeftContent">
-                                <ui:include src="policyPropertyEditPanelGrid.xhtml"/>
+                                <ui:include src="private/policyPropertyEditPanelGrid.xhtml"/>
                             </div>
                         </p:tab>
 
                         <p:tab title="Allowed Policy Values">                
-                             <ui:include src="../allowedPolicyValue/allowedPolicyValueListEditDataTable.xhtml"/>
+                             <ui:include src="../allowedPolicyValue/private/allowedPolicyValueListEditDataTable.xhtml"/>
                         </p:tab>
                     </p:accordionPanel>
 
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyCreatePanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyCreatePanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyDestroyDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyDestroyDialog.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyDestroyDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyListDataTable.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyListEditDataTable.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyListEditDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyListEditDataTable.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyListEditDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyProperty/policyPropertyViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/policyProperty/private/policyPropertyViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyProperty/view.xhtml b/src/java/DmWebPortal/web/views/policyProperty/view.xhtml
index e6b9c2c6..00e7d019 100644
--- a/src/java/DmWebPortal/web/views/policyProperty/view.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/view.xhtml
@@ -26,12 +26,12 @@
                     <p:accordionPanel multiple="true" activeIndex="0,1" >
                         <p:tab title="Policy Property Description">
                             <div class="middleCenterLeftContent">
-                                <ui:include src="policyPropertyViewPanelGrid.xhtml"/>
+                                <ui:include src="private/policyPropertyViewPanelGrid.xhtml"/>
                             </div>
                         </p:tab>
 
                         <p:tab title="Allowed Policy Values">                
-                            <ui:include src="/views/allowedPolicyValue/allowedPolicyValueListDataTable.xhtml"/>
+                            <ui:include src="/views/allowedPolicyValue/private/allowedPolicyValueListDataTable.xhtml"/>
                         </p:tab>
                     </p:accordionPanel>
 
diff --git a/src/java/DmWebPortal/web/views/policyType/edit.xhtml b/src/java/DmWebPortal/web/views/policyType/edit.xhtml
index a092d183..9f61558e 100644
--- a/src/java/DmWebPortal/web/views/policyType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/edit.xhtml
@@ -26,12 +26,12 @@
                     <p:accordionPanel multiple="true" activeIndex="0,1" >
                         <p:tab title="Policy Type Description">
                             <div class="middleCenterLeftContent">
-                                <ui:include src="policyTypeEditPanelGrid.xhtml"/>
+                                <ui:include src="private/policyTypeEditPanelGrid.xhtml"/>
                             </div>
                         </p:tab>
 
                         <p:tab title="Properties">                
-                             <ui:include src="/views/policyProperty/policyPropertyListEditDataTable.xhtml"/>
+                             <ui:include src="/views/policyProperty/private/policyPropertyListEditDataTable.xhtml"/>
                         </p:tab>
                     </p:accordionPanel>
 
diff --git a/src/java/DmWebPortal/web/views/policyType/list.xhtml b/src/java/DmWebPortal/web/views/policyType/list.xhtml
index b33b22c6..1b4e390f 100644
--- a/src/java/DmWebPortal/web/views/policyType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/list.xhtml
@@ -28,7 +28,7 @@
             </div>
 
             <h:panelGroup>  
-                <ui:include src="policyTypeListDataTable.xhtml"/>
+                <ui:include src="private/policyTypeListDataTable.xhtml"/>
             </h:panelGroup>
 
         </h:form>
diff --git a/src/java/DmWebPortal/web/views/policyType/policyTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/policyType/private/policyTypeEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyType/policyTypeEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/policyType/private/policyTypeEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyType/policyTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/policyType/private/policyTypeListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyType/policyTypeListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/policyType/private/policyTypeListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyType/policyTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/policyType/private/policyTypeViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/policyType/policyTypeViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/policyType/private/policyTypeViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/policyType/view.xhtml b/src/java/DmWebPortal/web/views/policyType/view.xhtml
index 56682ff8..651f1391 100644
--- a/src/java/DmWebPortal/web/views/policyType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/view.xhtml
@@ -24,12 +24,12 @@
                     <p:accordionPanel multiple="true" activeIndex="0,1" >
                         <p:tab title="Policy Type Description">
                             <div class="middleCenterLeftContent">
-                                <ui:include src="policyTypeViewPanelGrid.xhtml"/>
+                                <ui:include src="private/policyTypeViewPanelGrid.xhtml"/>
                             </div>
                         </p:tab>
 
                         <p:tab title="Properties">                
-                            <ui:include src="../policyProperty/policyPropertyListDataTable.xhtml"/>
+                            <ui:include src="../policyProperty/private/policyPropertyListDataTable.xhtml"/>
                         </p:tab>
                     </p:accordionPanel>
 
diff --git a/src/java/DmWebPortal/web/views/roleType/edit.xhtml b/src/java/DmWebPortal/web/views/roleType/edit.xhtml
index 1981fd42..c9da4b7e 100644
--- a/src/java/DmWebPortal/web/views/roleType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/edit.xhtml
@@ -21,7 +21,7 @@
                     <h1>Edit Role Type</h1>
                 </div>
 
-                <ui:include src="roleTypeEditPanelGrid.xhtml"/>
+                <ui:include src="private/roleTypeEditPanelGrid.xhtml"/>
                 <p/>
                 <div class="actionButton">
                     <p:commandButton action="#{roleTypeController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
diff --git a/src/java/DmWebPortal/web/views/roleType/list.xhtml b/src/java/DmWebPortal/web/views/roleType/list.xhtml
index 2c66e757..0d37c406 100644
--- a/src/java/DmWebPortal/web/views/roleType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/list.xhtml
@@ -28,7 +28,7 @@
             </div>
 
             <h:panelGroup>  
-                <ui:include src="roleTypeListDataTable.xhtml"/>
+                <ui:include src="private/roleTypeListDataTable.xhtml"/>
             </h:panelGroup>
 
         </h:form>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/private/roleTypeCreatePanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/roleType/private/roleTypeCreatePanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/private/roleTypeEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/roleType/private/roleTypeEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/roleType/private/roleTypeListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/roleType/private/roleTypeListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/private/roleTypeViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/roleType/private/roleTypeViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/roleType/view.xhtml b/src/java/DmWebPortal/web/views/roleType/view.xhtml
index 1545faa5..bac73fb5 100644
--- a/src/java/DmWebPortal/web/views/roleType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/view.xhtml
@@ -20,7 +20,7 @@
                     <h1>Role Type Details</h1>
                 </div>
 
-                <ui:include src="roleTypeViewPanelGrid.xhtml"/>
+                <ui:include src="private/roleTypeViewPanelGrid.xhtml"/>
                 
                 <p/>
                 <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
diff --git a/src/java/DmWebPortal/web/views/userInfo/create.xhtml b/src/java/DmWebPortal/web/views/userInfo/create.xhtml
index 83fd3ddb..ca5904f6 100644
--- a/src/java/DmWebPortal/web/views/userInfo/create.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/create.xhtml
@@ -19,7 +19,7 @@
 
         <h:form id="addUserInfoForm">
 
-            <ui:include src="userInfoCreatePanelGrid.xhtml"/>
+            <ui:include src="private/userInfoCreatePanelGrid.xhtml"/>
 
             <p/>
             <div class="actionButton">
diff --git a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
index af3a803f..ccc9f04b 100644
--- a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
@@ -21,7 +21,7 @@
                     <h1>Edit User #{userInfoController.current.username}</h1>
                 </div>
 
-                <ui:include src="userInfoEditPanelGrid.xhtml"/>
+                <ui:include src="private/userInfoEditPanelGrid.xhtml"/>
                 <p/>
                 <div class="actionButton">
                     <p:commandButton action="#{userInfoController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
diff --git a/src/java/DmWebPortal/web/views/userInfo/list.xhtml b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
index 80585f77..0fea12ec 100644
--- a/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
@@ -21,10 +21,10 @@
             <ui:include src="../common/commonListActionButtons.xhtml"/>
 
             <h:panelGroup>  
-                <ui:include src="userInfoListDataTable.xhtml"/>
+                <ui:include src="private/userInfoListDataTable.xhtml"/>
             </h:panelGroup>
 
-            <ui:include src="userInfoDestroyDialog.xhtml"/>
+            <ui:include src="private/userInfoDestroyDialog.xhtml"/>
 
         </h:form>
 
diff --git a/src/java/DmWebPortal/web/views/userInfo/userExperimentsListDataTable.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userExperimentsListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userExperimentsListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userExperimentsListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoCreatePanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userInfoCreatePanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoDestroyDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userInfoDestroyDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userInfoEditPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userInfoListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/private/userInfoViewPanelGrid.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml
rename to src/java/DmWebPortal/web/views/userInfo/private/userInfoViewPanelGrid.xhtml
diff --git a/src/java/DmWebPortal/web/views/userInfo/view.xhtml b/src/java/DmWebPortal/web/views/userInfo/view.xhtml
index be2d53cd..d11c5183 100644
--- a/src/java/DmWebPortal/web/views/userInfo/view.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/view.xhtml
@@ -22,12 +22,12 @@
             <p:accordionPanel multiple="true" activeIndex="0,1" >
                 <p:tab title="User Properties">
                     <div class="middleCenterLeftContent">
-                        <ui:include src="userInfoViewPanelGrid.xhtml"/>
+                        <ui:include src="private/userInfoViewPanelGrid.xhtml"/>
                     </div>
                 </p:tab>
 
                 <p:tab title="User Experiments">                
-                    <ui:include src="userExperimentsListDataTable.xhtml"/>
+                    <ui:include src="private/userExperimentsListDataTable.xhtml"/>
                 </p:tab>
             </p:accordionPanel>
 
@@ -41,7 +41,7 @@
                     <p:commandButton action="#{userInfoController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
                 </div>
 
-                <ui:include src="userInfoDestroyDialog.xhtml"/>
+                <ui:include src="private/userInfoDestroyDialog.xhtml"/>
 
         </h:form>
     </ui:define>
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
index 099d4cc9..0a565aff 100644
--- a/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
@@ -32,11 +32,11 @@
             </div>
 
             <h:panelGroup>  
-                <ui:include src="systemRoleListDataTable.xhtml"/>
+                <ui:include src="private/systemRoleListDataTable.xhtml"/>
             </h:panelGroup>
 
-            <ui:include src="systemRoleRemoveDialog.xhtml" />                  
-            <ui:include src="systemRoleAddDialog.xhtml"/>
+            <ui:include src="private/systemRoleRemoveDialog.xhtml" />                  
+            <ui:include src="private/systemRoleAddDialog.xhtml"/>
         </h:form>
 
     </ui:define>
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/systemRoleAddDialog.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleAddDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userSystemRole/systemRoleAddDialog.xhtml
rename to src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleAddDialog.xhtml
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/systemRoleListDataTable.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleListDataTable.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userSystemRole/systemRoleListDataTable.xhtml
rename to src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleListDataTable.xhtml
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleRemoveDialog.xhtml
similarity index 100%
rename from src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml
rename to src/java/DmWebPortal/web/views/userSystemRole/private/systemRoleRemoveDialog.xhtml
-- 
GitLab