diff --git a/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml b/src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml
index 8c60655e42f25cdf81922d659380e91df9693c40..29a11f1993328432358db185248ba4ea2fd84593 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 e684aa68f8b5fa8177e2fe4f9238b9c404e9e5fb..6505933fd9afd4f7443de5be93f8ca82e9d0c263 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 8a643352114c016efbda13779358710e383e0530..d589e947f63dd118bbb9d99cbf49108551c44ec7 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 8f7a6432b32c06d2416aa995836f3a8d0b686a25..88d2abfb4ad0dd794e5e9176e924f36696beda54 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 d9f4da35badc4bab3de8d95d76cbfe138cc9adb9..fa996446191060ae9c02c9d4f1ab8c8f06f7768a 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 15e061d0884a33ba739dc4380e9f924d814798cc..4bc18cd6bce56ea9b0a126f86c8ec3bd671dae5d 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 d8272096572de02952cce45ce0607d79f0df1add..643b556a9b1d6676fd0aa733683bc2f8de2fbea7 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 8791d3c5b6a6befc5ba32415b120ae9dd6324edd..7840f7412813649c278822c5fec89598f2b61d8c 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 f155bf5fc3f20d4c6cd7f504eb3733fe1c1d86b6..24762b308ee6e4b13231fb929930818defea0a5e 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 a2a17c583610949a87496f63a6a25cbec46a45e5..2503e36ea1c26e47e95217581509fb813dd9453c 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 34dce3600a20860734bd34719ffe7ad07659d50f..9865e5fd9d6e5b9b81acc804f16360f48ee08c5c 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 53bc135afc0e1c1b03f1cf9c01ca321e585074ca..ab717c734757e845eae806bb094fe2ab2f59f801 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 b251e6ff5f26f84f62e4f8ff77bd910c31f64be1..586d1aaa7675143f6259922b5dd5e277ca76a578 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 90d8b375f75d96eec59d1ff046a7908f2102b033..db9f111d53f9fce550c9b12d8c9b79aa4718efff 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 e6b9c2c67ca590a7b1089f30e65f4252dc4d208a..00e7d0193fe961818b97fa6d5510fd30c2a8472e 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 a092d1832cd7cded1dddd584415264922d37d4a9..9f61558ea5e3e63529743ecbcd46b90e61c7993a 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 b33b22c69b823b5e28ae1280b6fd0d2255ea4e05..1b4e390fcc208acbde8fa1569ffc237e130416ad 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 56682ff8b0aba464c41931576af65b639f99ce98..651f139104f39e8171b347eaf38bbf7de1ff4c93 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 1981fd4204001df63433ec881e0cb3fdcbb0874d..c9da4b7e4c2083b41483421242af1524bda3f479 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 2c66e7574fe297974e14dd73186d5ef8cb58c0cf..0d37c406803058b06c04b3b03cd3ebc7a6126cf0 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 1545faa5383948e06eaf0d27519837dd7d2a299d..bac73fb5be2a03e1ce1d8064f347c483fc0dc627 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 83fd3ddb9ba4045cfb4d3d1cac1fd382dd8cec14..ca5904f6f603dd8b9ef806c9a2940c990e511ba9 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 af3a803f815a54628ecd9cb0947269565a4a2d88..ccc9f04be5ea12598ca439905bd1bc05172f6fc9 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 80585f775adcfd710beaa4fedc3f7ab0f3de9871..0fea12ecda0b199d719f1294945b76f9be4fc645 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 be2d53cdc605984ed1ea52cefec13993628937fc..d11c5183702baf9056f7960fe1c65a246da0d78a 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 099d4cc9603871d47f635e8b6c1336d01d6fd827..0a565aff0268e051c72eaef4ddb102f3c440488d 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