diff --git a/pom.xml b/pom.xml
index 4f1013e4c..af5c2ad7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,9 @@
     </parent>
 
     <modules>
-        <module>alfresco-community-distribution</module>
-        <module>alfresco-community-installer-resources</module>
-        <module>alfresco-content-repository</module>
-        <module>alfresco-platform-community-distributionzip</module>
+        <module>sdk</module>
+        <module>war</module>
+        <module>zip</module>
     </modules>
 
     <scm>
diff --git a/alfresco-community-distribution/pom.xml b/sdk/pom.xml
similarity index 100%
rename from alfresco-community-distribution/pom.xml
rename to sdk/pom.xml
diff --git a/alfresco-community-distribution/src/site/apt/index.apt.vm b/sdk/src/site/apt/index.apt.vm
similarity index 100%
rename from alfresco-community-distribution/src/site/apt/index.apt.vm
rename to sdk/src/site/apt/index.apt.vm
diff --git a/alfresco-community-distribution/src/site/site.xml b/sdk/src/site/site.xml
similarity index 100%
rename from alfresco-community-distribution/src/site/site.xml
rename to sdk/src/site/site.xml
diff --git a/alfresco-content-repository/pom.xml b/war/pom.xml
similarity index 100%
rename from alfresco-content-repository/pom.xml
rename to war/pom.xml
diff --git a/alfresco-content-repository/src/main/META-INF/application.xml b/war/src/main/META-INF/application.xml
similarity index 100%
rename from alfresco-content-repository/src/main/META-INF/application.xml
rename to war/src/main/META-INF/application.xml
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java b/war/src/main/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
rename to war/src/main/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java b/war/src/main/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
rename to war/src/main/java/org/alfresco/repo/web/scripts/portlet/WebScriptRepoPortlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/servlet/AuthenticatorServlet.java b/war/src/main/java/org/alfresco/repo/web/scripts/servlet/AuthenticatorServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/servlet/AuthenticatorServlet.java
rename to war/src/main/java/org/alfresco/repo/web/scripts/servlet/AuthenticatorServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java b/war/src/main/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
rename to war/src/main/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/ActionEvaluator.java b/war/src/main/java/org/alfresco/web/action/ActionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/ActionEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/ActionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/AddTranslationEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/AddTranslationEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/AddTranslationEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/AddTranslationEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/ApproveDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/ApproveNonDraftDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/BaseActionEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/BaseActionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/BaseActionEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/BaseActionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CancelCheckoutDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelEditingDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CancelEditingDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelEditingDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CancelEditingDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CheckinDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CheckoutDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CreateForumNodeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CutNodeEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/CutNodeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/CutNodeEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/CutNodeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/DiscussNodeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussionCutEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/DiscussionCutEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DiscussionCutEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/DiscussionCutEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DoneEditingDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/DoneEditingDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/DoneEditingDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/DoneEditingDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOfflineEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocOfflineEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOfflineEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocOfflineEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineCIFSEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineCIFSEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineCIFSEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineCIFSEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineHttpEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineHttpEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineHttpEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineHttpEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineWebDavEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineWebDavEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineWebDavEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocOnlineWebDavEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditPostEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/EditPostEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/EditPostEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/EditPostEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/ForumsCheckinDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/GroupActionEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/GroupActionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/GroupActionEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/GroupActionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/MakeMultilingualEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/MakeMultilingualEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/MakeMultilingualEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/MakeMultilingualEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/MultilingualDetailsEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/MultilingualDetailsEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/MultilingualDetailsEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/MultilingualDetailsEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/NewEditionEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/NewEditionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/NewEditionEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/NewEditionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/RejectDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/RejectNonDraftDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/ShortcutNodeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/StartWorkflowEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/StartWorkflowEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/StartWorkflowEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/StartWorkflowEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/TakeOwnershipDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UnlockedDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/UnlockedDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UnlockedDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/UnlockedDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/UpdateDocEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UploadNewVersionEvaluator.java b/war/src/main/java/org/alfresco/web/action/evaluator/UploadNewVersionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/action/evaluator/UploadNewVersionEvaluator.java
rename to war/src/main/java/org/alfresco/web/action/evaluator/UploadNewVersionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/war/src/main/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
rename to war/src/main/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/AlfrescoVariableResolver.java b/war/src/main/java/org/alfresco/web/app/AlfrescoVariableResolver.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/AlfrescoVariableResolver.java
rename to war/src/main/java/org/alfresco/web/app/AlfrescoVariableResolver.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/Application.java b/war/src/main/java/org/alfresco/web/app/Application.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/Application.java
rename to war/src/main/java/org/alfresco/web/app/Application.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/ContextListener.java b/war/src/main/java/org/alfresco/web/app/ContextListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/ContextListener.java
rename to war/src/main/java/org/alfresco/web/app/ContextListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/ContextLoaderListener.java b/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
rename to war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/DebugPhaseListener.java b/war/src/main/java/org/alfresco/web/app/DebugPhaseListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/DebugPhaseListener.java
rename to war/src/main/java/org/alfresco/web/app/DebugPhaseListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/ResourceBundleBootstrap.java b/war/src/main/java/org/alfresco/web/app/ResourceBundleBootstrap.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/ResourceBundleBootstrap.java
rename to war/src/main/java/org/alfresco/web/app/ResourceBundleBootstrap.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/ResourceBundleWrapper.java b/war/src/main/java/org/alfresco/web/app/ResourceBundleWrapper.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/ResourceBundleWrapper.java
rename to war/src/main/java/org/alfresco/web/app/ResourceBundleWrapper.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/context/IContextListener.java b/war/src/main/java/org/alfresco/web/app/context/IContextListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/context/IContextListener.java
rename to war/src/main/java/org/alfresco/web/app/context/IContextListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/context/UIContextService.java b/war/src/main/java/org/alfresco/web/app/context/UIContextService.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/context/UIContextService.java
rename to war/src/main/java/org/alfresco/web/app/context/UIContextService.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/portlet/AlfrescoDefaultViewSelector.java b/war/src/main/java/org/alfresco/web/app/portlet/AlfrescoDefaultViewSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/portlet/AlfrescoDefaultViewSelector.java
rename to war/src/main/java/org/alfresco/web/app/portlet/AlfrescoDefaultViewSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java b/war/src/main/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
rename to war/src/main/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AbstractAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/AbstractAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AbstractAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AbstractAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AcceptLanguage.java b/war/src/main/java/org/alfresco/web/app/servlet/AcceptLanguage.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AcceptLanguage.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AcceptLanguage.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AdminAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/AdminAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AdminAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AdminAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/war/src/main/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationStatus.java b/war/src/main/java/org/alfresco/web/app/servlet/AuthenticationStatus.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/AuthenticationStatus.java
rename to war/src/main/java/org/alfresco/web/app/servlet/AuthenticationStatus.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/BaseServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/BaseServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/CmisSecurityContextCleanerFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/CmisSecurityContextCleanerFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/CmisSecurityContextCleanerFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/CmisSecurityContextCleanerFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/CommandServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/CommandServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/CommandServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/CommandServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/DownloadRawContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/DownloadRawContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/DownloadRawContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/DownloadRawContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/FacesHelper.java b/war/src/main/java/org/alfresco/web/app/servlet/FacesHelper.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/FacesHelper.java
rename to war/src/main/java/org/alfresco/web/app/servlet/FacesHelper.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GuestDownloadContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/GuestDownloadContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GuestDownloadContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/GuestDownloadContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/HTTPRequestAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/HTTPRequestAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/HTTPRequestAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/HTTPRequestAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java b/war/src/main/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java
rename to war/src/main/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/TemplateContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/UploadContentServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/UploadContentServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/UploadContentServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/UploadContentServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/UploadFileServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/UploadFileServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/UploadFileServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/UploadFileServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java b/war/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java
rename to war/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WorkflowDefinitionImageServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/WorkflowDefinitionImageServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/WorkflowDefinitionImageServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/WorkflowDefinitionImageServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java b/war/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/BaseAjaxCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/ajax/BaseAjaxCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/BaseAjaxCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ajax/BaseAjaxCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/GetCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/ajax/GetCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/GetCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ajax/GetCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ApproveWorkflowCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/ApproveWorkflowCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ApproveWorkflowCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/ApproveWorkflowCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/BaseNodeCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/BaseNodeCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/BaseNodeCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/BaseNodeCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/BaseUIActionCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/BaseUIActionCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/BaseUIActionCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/BaseUIActionCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/Command.java b/war/src/main/java/org/alfresco/web/app/servlet/command/Command.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/Command.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/Command.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/CommandFactory.java b/war/src/main/java/org/alfresco/web/app/servlet/command/CommandFactory.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/CommandFactory.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/CommandFactory.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/CommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/CommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/CommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/CommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EditSpaceCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/EditSpaceCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EditSpaceCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/EditSpaceCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EndTaskCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/EndTaskCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/EndTaskCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/EndTaskCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ExtCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/ExtCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ExtCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/ExtCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/ManageTaskDialogCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/RejectWorkflowCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/RejectWorkflowCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/RejectWorkflowCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/RejectWorkflowCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ScriptCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/ScriptCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/ScriptCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/ScriptCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java b/war/src/main/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/UserProfileDialogCommand.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/WorkflowCommandProcessor.java b/war/src/main/java/org/alfresco/web/app/servlet/command/WorkflowCommandProcessor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/app/servlet/command/WorkflowCommandProcessor.java
rename to war/src/main/java/org/alfresco/web/app/servlet/command/WorkflowCommandProcessor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/AboutBean.java b/war/src/main/java/org/alfresco/web/bean/AboutBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/AboutBean.java
rename to war/src/main/java/org/alfresco/web/bean/AboutBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/BaseDetailsBean.java b/war/src/main/java/org/alfresco/web/bean/BaseDetailsBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/BaseDetailsBean.java
rename to war/src/main/java/org/alfresco/web/bean/BaseDetailsBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/BrowseBean.java b/war/src/main/java/org/alfresco/web/bean/BrowseBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/BrowseBean.java
rename to war/src/main/java/org/alfresco/web/bean/BrowseBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/CategoriesProperties.java b/war/src/main/java/org/alfresco/web/bean/CategoriesProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/CategoriesProperties.java
rename to war/src/main/java/org/alfresco/web/bean/CategoriesProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/CategoryBrowserBean.java b/war/src/main/java/org/alfresco/web/bean/CategoryBrowserBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/CategoryBrowserBean.java
rename to war/src/main/java/org/alfresco/web/bean/CategoryBrowserBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ErrorBean.java b/war/src/main/java/org/alfresco/web/bean/ErrorBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ErrorBean.java
rename to war/src/main/java/org/alfresco/web/bean/ErrorBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/FileUploadBean.java b/war/src/main/java/org/alfresco/web/bean/FileUploadBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/FileUploadBean.java
rename to war/src/main/java/org/alfresco/web/bean/FileUploadBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/LinkPropertiesDialog.java b/war/src/main/java/org/alfresco/web/bean/LinkPropertiesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/LinkPropertiesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/LinkPropertiesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/LoginBean.java b/war/src/main/java/org/alfresco/web/bean/LoginBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/LoginBean.java
rename to war/src/main/java/org/alfresco/web/bean/LoginBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/LoginOutcomeBean.java b/war/src/main/java/org/alfresco/web/bean/LoginOutcomeBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/LoginOutcomeBean.java
rename to war/src/main/java/org/alfresco/web/bean/LoginOutcomeBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/MultiValueEditorBean.java b/war/src/main/java/org/alfresco/web/bean/MultiValueEditorBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/MultiValueEditorBean.java
rename to war/src/main/java/org/alfresco/web/bean/MultiValueEditorBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/NavigationBean.java b/war/src/main/java/org/alfresco/web/bean/NavigationBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/NavigationBean.java
rename to war/src/main/java/org/alfresco/web/bean/NavigationBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/NodeEventListener.java b/war/src/main/java/org/alfresco/web/bean/NodeEventListener.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/NodeEventListener.java
rename to war/src/main/java/org/alfresco/web/bean/NodeEventListener.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/SidebarBean.java b/war/src/main/java/org/alfresco/web/bean/SidebarBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/SidebarBean.java
rename to war/src/main/java/org/alfresco/web/bean/SidebarBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/SpaceLinkDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/TemplateMailHelperBean.java b/war/src/main/java/org/alfresco/web/bean/TemplateMailHelperBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/TemplateMailHelperBean.java
rename to war/src/main/java/org/alfresco/web/bean/TemplateMailHelperBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/TemplateSupportBean.java b/war/src/main/java/org/alfresco/web/bean/TemplateSupportBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/TemplateSupportBean.java
rename to war/src/main/java/org/alfresco/web/bean/TemplateSupportBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/BaseActionWizard.java b/war/src/main/java/org/alfresco/web/bean/actions/BaseActionWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/BaseActionWizard.java
rename to war/src/main/java/org/alfresco/web/bean/actions/BaseActionWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/IHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/IHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/IHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/IHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/RunActionWizard.java b/war/src/main/java/org/alfresco/web/bean/actions/RunActionWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/RunActionWizard.java
rename to war/src/main/java/org/alfresco/web/bean/actions/RunActionWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/AddFeaturesHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/AddFeaturesHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/AddFeaturesHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/AddFeaturesHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/BaseActionHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/BaseActionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/BaseActionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/BaseActionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CheckInHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/CheckInHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CheckInHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/CheckInHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CheckOutHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/CheckOutHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CheckOutHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/CheckOutHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/ImportHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/ImportHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/ImportHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/ImportHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/LinkCategoryHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/LinkCategoryHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/LinkCategoryHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/LinkCategoryHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/MailHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/MailHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/MailHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/MailHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/RemoveFeaturesHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/RemoveFeaturesHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/RemoveFeaturesHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/RemoveFeaturesHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/ScriptHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/ScriptHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/ScriptHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/ScriptHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/SimpleWorkflowHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/SimpleWorkflowHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/SimpleWorkflowHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/SimpleWorkflowHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/SpecialiseTypeHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/SpecialiseTypeHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/SpecialiseTypeHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/SpecialiseTypeHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/TransformHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/TransformHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/TransformHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/TransformHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/TransformImageHandler.java b/war/src/main/java/org/alfresco/web/bean/actions/handlers/TransformImageHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/actions/handlers/TransformImageHandler.java
rename to war/src/main/java/org/alfresco/web/bean/actions/handlers/TransformImageHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/AdminConsoleDialog.java b/war/src/main/java/org/alfresco/web/bean/admin/AdminConsoleDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/AdminConsoleDialog.java
rename to war/src/main/java/org/alfresco/web/bean/admin/AdminConsoleDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java b/war/src/main/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
rename to war/src/main/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java b/war/src/main/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java
rename to war/src/main/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ExportDialog.java b/war/src/main/java/org/alfresco/web/bean/admin/ExportDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ExportDialog.java
rename to war/src/main/java/org/alfresco/web/bean/admin/ExportDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ImportDialog.java b/war/src/main/java/org/alfresco/web/bean/admin/ImportDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ImportDialog.java
rename to war/src/main/java/org/alfresco/web/bean/admin/ImportDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ShowSystemInfoDialog.java b/war/src/main/java/org/alfresco/web/bean/admin/ShowSystemInfoDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/admin/ShowSystemInfoDialog.java
rename to war/src/main/java/org/alfresco/web/bean/admin/ShowSystemInfoDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/CategoryBrowserPluginBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/CategoryBrowserPluginBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/CategoryBrowserPluginBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/CategoryBrowserPluginBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/ContentUpdateBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/ContentUpdateBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/ContentUpdateBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/ContentUpdateBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/FileUploadBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/FileUploadBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/FileUploadBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/FileUploadBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/MySpacesBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/MySpacesBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/MySpacesBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/MySpacesBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/NavigatorPluginBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/NavigatorPluginBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/NavigatorPluginBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/NavigatorPluginBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/NodeInfoBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/NodeInfoBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PickerBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/PickerBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PickerBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/PickerBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PortletActionsBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/PortletActionsBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PortletActionsBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/PortletActionsBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/TaskInfoBean.java b/war/src/main/java/org/alfresco/web/bean/ajax/TaskInfoBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ajax/TaskInfoBean.java
rename to war/src/main/java/org/alfresco/web/bean/ajax/TaskInfoBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/CategoriesDialog.java b/war/src/main/java/org/alfresco/web/bean/categories/CategoriesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/CategoriesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/categories/CategoriesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java b/war/src/main/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java
rename to war/src/main/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java b/war/src/main/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
rename to war/src/main/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/EditCategoryDialog.java b/war/src/main/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
rename to war/src/main/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java b/war/src/main/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java b/war/src/main/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
rename to war/src/main/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
rename to war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardItem.java b/war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
rename to war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java b/war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java
rename to war/src/main/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/war/src/main/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
rename to war/src/main/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCCheckoutFileLinkDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditFileDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCEditFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCEditFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditHtmlInlineDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCEditHtmlInlineDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditHtmlInlineDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCEditHtmlInlineDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditTextInlineDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCEditTextInlineDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCEditTextInlineDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCEditTextInlineDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCProperties.java b/war/src/main/java/org/alfresco/web/bean/coci/CCProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCProperties.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCUpdateFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CCWorkingCopyMissingDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CancelEditingDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/DoneEditingDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/DoneEditingDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/DoneEditingDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/DoneEditingDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/EditOfflineDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/EditOfflineDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/EditOfflineDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/EditOfflineDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/EditOnlineDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/EditOnlineDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java b/war/src/main/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
rename to war/src/main/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/AddContentDialog.java b/war/src/main/java/org/alfresco/web/bean/content/AddContentDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/AddContentDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/AddContentDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/BaseContentWizard.java b/war/src/main/java/org/alfresco/web/bean/content/BaseContentWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/BaseContentWizard.java
rename to war/src/main/java/org/alfresco/web/bean/content/BaseContentWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/CreateContentWizard.java b/war/src/main/java/org/alfresco/web/bean/content/CreateContentWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/CreateContentWizard.java
rename to war/src/main/java/org/alfresco/web/bean/content/CreateContentWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DeleteContentAssociationDialog.java b/war/src/main/java/org/alfresco/web/bean/content/DeleteContentAssociationDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DeleteContentAssociationDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/DeleteContentAssociationDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DeleteContentDialog.java b/war/src/main/java/org/alfresco/web/bean/content/DeleteContentDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DeleteContentDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/DeleteContentDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/DocumentLinkDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java b/war/src/main/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/DocumentPropertiesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java b/war/src/main/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditContentWizard.java b/war/src/main/java/org/alfresco/web/bean/content/EditContentWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditContentWizard.java
rename to war/src/main/java/org/alfresco/web/bean/content/EditContentWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditSimpleWorkflowDialog.java b/war/src/main/java/org/alfresco/web/bean/content/EditSimpleWorkflowDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/EditSimpleWorkflowDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/EditSimpleWorkflowDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java b/war/src/main/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java
rename to war/src/main/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/SetContentPropertiesDialog.java b/war/src/main/java/org/alfresco/web/bean/content/SetContentPropertiesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/SetContentPropertiesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/SetContentPropertiesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java b/war/src/main/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/DashboardManager.java b/war/src/main/java/org/alfresco/web/bean/dashboard/DashboardManager.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/DashboardManager.java
rename to war/src/main/java/org/alfresco/web/bean/dashboard/DashboardManager.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/DashboardWizard.java b/war/src/main/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
rename to war/src/main/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/GettingStartedBean.java b/war/src/main/java/org/alfresco/web/bean/dashboard/GettingStartedBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/GettingStartedBean.java
rename to war/src/main/java/org/alfresco/web/bean/dashboard/GettingStartedBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/PageConfig.java b/war/src/main/java/org/alfresco/web/bean/dashboard/PageConfig.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dashboard/PageConfig.java
rename to war/src/main/java/org/alfresco/web/bean/dashboard/PageConfig.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/BaseDialogBean.java b/war/src/main/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/ChangeViewSupport.java b/war/src/main/java/org/alfresco/web/bean/dialog/ChangeViewSupport.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/ChangeViewSupport.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/ChangeViewSupport.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/DialogManager.java b/war/src/main/java/org/alfresco/web/bean/dialog/DialogManager.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/DialogManager.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/DialogManager.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/DialogState.java b/war/src/main/java/org/alfresco/web/bean/dialog/DialogState.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/DialogState.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/DialogState.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/FilterViewSupport.java b/war/src/main/java/org/alfresco/web/bean/dialog/FilterViewSupport.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/FilterViewSupport.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/FilterViewSupport.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/IDialogBean.java b/war/src/main/java/org/alfresco/web/bean/dialog/IDialogBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/IDialogBean.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/IDialogBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/NavigationSupport.java b/war/src/main/java/org/alfresco/web/bean/dialog/NavigationSupport.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/dialog/NavigationSupport.java
rename to war/src/main/java/org/alfresco/web/bean/dialog/NavigationSupport.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateForumDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreateForumDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateForumDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreateForumDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateForumsDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreateForumsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateForumsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreateForumsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreatePostDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreatePostDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreatePostDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreatePostDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateReplyDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateTopicDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/CreateTopicDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/CreateTopicDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/CreateTopicDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteForumDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/DeleteForumDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteForumDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/DeleteForumDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeletePostDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/DeletePostDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeletePostDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/DeletePostDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/EditPostDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/EditPostDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/EditPostDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/EditPostDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/ForumDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumsBean.java b/war/src/main/java/org/alfresco/web/bean/forums/ForumsBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumsBean.java
rename to war/src/main/java/org/alfresco/web/bean/forums/ForumsBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/ForumsDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/forums/TopicDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/AjaxTagPickerGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/AjaxTagPickerGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/AjaxTagPickerGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/AjaxTagPickerGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/AssociationGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/AssociationGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/AssociationGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/AssociationGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CategorySelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/CategorySelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CategorySelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/CategorySelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CharsetSelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/CharsetSelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CharsetSelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/CharsetSelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CheckboxGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/CheckboxGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/CheckboxGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/CheckboxGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/ChildAssociationGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/ChildAssociationGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/ChildAssociationGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/ChildAssociationGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/DatePickerGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/DatePickerGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/DatePickerGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/DatePickerGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/DateTimePickerGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/DateTimePickerGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/DateTimePickerGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/DateTimePickerGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/HeaderSeparatorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/HeaderSeparatorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/HeaderSeparatorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/HeaderSeparatorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/HtmlSeparatorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/HtmlSeparatorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/HtmlSeparatorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/HtmlSeparatorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/IComponentGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/IComponentGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/IComponentGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/IComponentGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LabelGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/LabelGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LabelGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/LabelGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LabelSeparatorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/LabelSeparatorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LabelSeparatorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/LabelSeparatorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LanguageSelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/LanguageSelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LanguageSelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/LanguageSelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LinkGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/LinkGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/LinkGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/LinkGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MimeTypeSelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/MimeTypeSelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MimeTypeSelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/MimeTypeSelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MlContainerLanguageSelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/MlContainerLanguageSelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MlContainerLanguageSelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/MlContainerLanguageSelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MultilingualTextAreaGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/MultilingualTextAreaGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MultilingualTextAreaGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/MultilingualTextAreaGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MultilingualTextFieldGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/MultilingualTextFieldGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/MultilingualTextFieldGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/MultilingualTextFieldGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/SeparatorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/SeparatorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/SeparatorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/SeparatorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/SpaceIconPickerGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/SpaceIconPickerGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/SpaceIconPickerGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/SpaceIconPickerGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/StoreSelectorGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/StoreSelectorGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/StoreSelectorGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/StoreSelectorGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/TextAreaGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/TextAreaGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/TextAreaGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/TextAreaGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/TextFieldGenerator.java b/war/src/main/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
rename to war/src/main/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/AddUsersDialog.java b/war/src/main/java/org/alfresco/web/bean/groups/AddUsersDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/AddUsersDialog.java
rename to war/src/main/java/org/alfresco/web/bean/groups/AddUsersDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/CreateGroupDialog.java b/war/src/main/java/org/alfresco/web/bean/groups/CreateGroupDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/CreateGroupDialog.java
rename to war/src/main/java/org/alfresco/web/bean/groups/CreateGroupDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java b/war/src/main/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java
rename to war/src/main/java/org/alfresco/web/bean/groups/DeleteGroupDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/GroupsDialog.java b/war/src/main/java/org/alfresco/web/bean/groups/GroupsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/groups/GroupsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/groups/GroupsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/jmx/JmxDumperBean.java b/war/src/main/java/org/alfresco/web/bean/jmx/JmxDumperBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/jmx/JmxDumperBean.java
rename to war/src/main/java/org/alfresco/web/bean/jmx/JmxDumperBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/AddTranslationDialog.java b/war/src/main/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
rename to war/src/main/java/org/alfresco/web/bean/ml/AddTranslationDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java b/war/src/main/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
rename to war/src/main/java/org/alfresco/web/bean/ml/AddTranslationWithoutContentDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/EditMLContainerDialog.java b/war/src/main/java/org/alfresco/web/bean/ml/EditMLContainerDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/EditMLContainerDialog.java
rename to war/src/main/java/org/alfresco/web/bean/ml/EditMLContainerDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java b/war/src/main/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
rename to war/src/main/java/org/alfresco/web/bean/ml/MakeMultilingualDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java b/war/src/main/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java
rename to war/src/main/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MultilingualUtils.java b/war/src/main/java/org/alfresco/web/bean/ml/MultilingualUtils.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/MultilingualUtils.java
rename to war/src/main/java/org/alfresco/web/bean/ml/MultilingualUtils.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/NewEditionWizard.java b/war/src/main/java/org/alfresco/web/bean/ml/NewEditionWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/NewEditionWizard.java
rename to war/src/main/java/org/alfresco/web/bean/ml/NewEditionWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/SingleEditionBean.java b/war/src/main/java/org/alfresco/web/bean/ml/SingleEditionBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/ml/SingleEditionBean.java
rename to war/src/main/java/org/alfresco/web/bean/ml/SingleEditionBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/BasePreviewBean.java b/war/src/main/java/org/alfresco/web/bean/preview/BasePreviewBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/BasePreviewBean.java
rename to war/src/main/java/org/alfresco/web/bean/preview/BasePreviewBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java b/war/src/main/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java
rename to war/src/main/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/SpacePreviewBean.java b/war/src/main/java/org/alfresco/web/bean/preview/SpacePreviewBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/preview/SpacePreviewBean.java
rename to war/src/main/java/org/alfresco/web/bean/preview/SpacePreviewBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/DataDictionary.java b/war/src/main/java/org/alfresco/web/bean/repository/DataDictionary.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/DataDictionary.java
rename to war/src/main/java/org/alfresco/web/bean/repository/DataDictionary.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/MapNode.java b/war/src/main/java/org/alfresco/web/bean/repository/MapNode.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/MapNode.java
rename to war/src/main/java/org/alfresco/web/bean/repository/MapNode.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Node.java b/war/src/main/java/org/alfresco/web/bean/repository/Node.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Node.java
rename to war/src/main/java/org/alfresco/web/bean/repository/Node.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/NodePropertyResolver.java b/war/src/main/java/org/alfresco/web/bean/repository/NodePropertyResolver.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/NodePropertyResolver.java
rename to war/src/main/java/org/alfresco/web/bean/repository/NodePropertyResolver.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Preferences.java b/war/src/main/java/org/alfresco/web/bean/repository/Preferences.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Preferences.java
rename to war/src/main/java/org/alfresco/web/bean/repository/Preferences.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/PreferencesService.java b/war/src/main/java/org/alfresco/web/bean/repository/PreferencesService.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/PreferencesService.java
rename to war/src/main/java/org/alfresco/web/bean/repository/PreferencesService.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/QNameNodeMap.java b/war/src/main/java/org/alfresco/web/bean/repository/QNameNodeMap.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/QNameNodeMap.java
rename to war/src/main/java/org/alfresco/web/bean/repository/QNameNodeMap.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Repository.java b/war/src/main/java/org/alfresco/web/bean/repository/Repository.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/Repository.java
rename to war/src/main/java/org/alfresco/web/bean/repository/Repository.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/TransientMapNode.java b/war/src/main/java/org/alfresco/web/bean/repository/TransientMapNode.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/TransientMapNode.java
rename to war/src/main/java/org/alfresco/web/bean/repository/TransientMapNode.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/TransientNode.java b/war/src/main/java/org/alfresco/web/bean/repository/TransientNode.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/TransientNode.java
rename to war/src/main/java/org/alfresco/web/bean/repository/TransientNode.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/User.java b/war/src/main/java/org/alfresco/web/bean/repository/User.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/User.java
rename to war/src/main/java/org/alfresco/web/bean/repository/User.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java b/war/src/main/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java
rename to war/src/main/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java b/war/src/main/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java
rename to war/src/main/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java b/war/src/main/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
rename to war/src/main/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/CreateRuleWizard.java b/war/src/main/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
rename to war/src/main/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java b/war/src/main/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
rename to war/src/main/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/EditRuleWizard.java b/war/src/main/java/org/alfresco/web/bean/rules/EditRuleWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/EditRuleWizard.java
rename to war/src/main/java/org/alfresco/web/bean/rules/EditRuleWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/RulesDialog.java b/war/src/main/java/org/alfresco/web/bean/rules/RulesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/RulesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/rules/RulesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/BaseConditionHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/BaseConditionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/BaseConditionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/BaseConditionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/CompareMimeTypeHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/CompareMimeTypeHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/CompareMimeTypeHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/CompareMimeTypeHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/CompositeConditionHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/CompositeConditionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/CompositeConditionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/CompositeConditionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/HasAspectHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/HasAspectHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/HasAspectHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/HasAspectHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/HasTagHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/HasTagHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/HasTagHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/HasTagHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/InCategoryHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/InCategoryHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/InCategoryHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/InCategoryHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/IsSubTypeHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/IsSubTypeHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/IsSubTypeHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/IsSubTypeHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/PropertyValueHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/PropertyValueHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/PropertyValueHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/PropertyValueHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/DatePropertyValueConditionHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/property/DatePropertyValueConditionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/DatePropertyValueConditionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/property/DatePropertyValueConditionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/IntegerPropertyValueConditionHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/property/IntegerPropertyValueConditionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/IntegerPropertyValueConditionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/property/IntegerPropertyValueConditionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/TextPropertyValueConditionHandler.java b/war/src/main/java/org/alfresco/web/bean/rules/handlers/property/TextPropertyValueConditionHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/rules/handlers/property/TextPropertyValueConditionHandler.java
rename to war/src/main/java/org/alfresco/web/bean/rules/handlers/property/TextPropertyValueConditionHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/war/src/main/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
rename to war/src/main/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/EditSearchDialog.java b/war/src/main/java/org/alfresco/web/bean/search/EditSearchDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/EditSearchDialog.java
rename to war/src/main/java/org/alfresco/web/bean/search/EditSearchDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SaveSearchDialog.java b/war/src/main/java/org/alfresco/web/bean/search/SaveSearchDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SaveSearchDialog.java
rename to war/src/main/java/org/alfresco/web/bean/search/SaveSearchDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SearchContext.java b/war/src/main/java/org/alfresco/web/bean/search/SearchContext.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SearchContext.java
rename to war/src/main/java/org/alfresco/web/bean/search/SearchContext.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SearchProperties.java b/war/src/main/java/org/alfresco/web/bean/search/SearchProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/search/SearchProperties.java
rename to war/src/main/java/org/alfresco/web/bean/search/SearchProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/war/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/EditSimpleWorkflowDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/EditSimpleWorkflowDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/EditSimpleWorkflowDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/EditSimpleWorkflowDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java b/war/src/main/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/RecentSpacesBean.java b/war/src/main/java/org/alfresco/web/bean/spaces/RecentSpacesBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/RecentSpacesBean.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/RecentSpacesBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteAllItemsDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteAllItemsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteAllItemsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteAllItemsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteListedItemsDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteListedItemsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteListedItemsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDeleteListedItemsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialogProperty.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialogProperty.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialogProperty.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanDialogProperty.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanItemDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverListedItemsDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverListedItemsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverListedItemsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoverListedItemsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoveryReportDialog.java b/war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoveryReportDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoveryReportDialog.java
rename to war/src/main/java/org/alfresco/web/bean/trashcan/TrashcanRecoveryReportDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ChangeMyPasswordDialog.java b/war/src/main/java/org/alfresco/web/bean/users/ChangeMyPasswordDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ChangeMyPasswordDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/ChangeMyPasswordDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ChangePasswordDialog.java b/war/src/main/java/org/alfresco/web/bean/users/ChangePasswordDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ChangePasswordDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/ChangePasswordDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ContentUsersBean.java b/war/src/main/java/org/alfresco/web/bean/users/ContentUsersBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/ContentUsersBean.java
rename to war/src/main/java/org/alfresco/web/bean/users/ContentUsersBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/CreateUserWizard.java b/war/src/main/java/org/alfresco/web/bean/users/CreateUserWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/CreateUserWizard.java
rename to war/src/main/java/org/alfresco/web/bean/users/CreateUserWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/DeleteUserDialog.java b/war/src/main/java/org/alfresco/web/bean/users/DeleteUserDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/DeleteUserDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/DeleteUserDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditContentUserRolesDialog.java b/war/src/main/java/org/alfresco/web/bean/users/EditContentUserRolesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditContentUserRolesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/EditContentUserRolesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditFileDialog.java b/war/src/main/java/org/alfresco/web/bean/users/EditFileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditFileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/EditFileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java b/war/src/main/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserRolesDialog.java b/war/src/main/java/org/alfresco/web/bean/users/EditUserRolesDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserRolesDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/EditUserRolesDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserWizard.java b/war/src/main/java/org/alfresco/web/bean/users/EditUserWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EditUserWizard.java
rename to war/src/main/java/org/alfresco/web/bean/users/EditUserWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EmailSpaceUsersDialog.java b/war/src/main/java/org/alfresco/web/bean/users/EmailSpaceUsersDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/EmailSpaceUsersDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/EmailSpaceUsersDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java b/war/src/main/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
rename to war/src/main/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java b/war/src/main/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/RemoveContentUserDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java b/war/src/main/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/RemoveInvitedUserDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/SpaceUsersBean.java b/war/src/main/java/org/alfresco/web/bean/users/SpaceUsersBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/SpaceUsersBean.java
rename to war/src/main/java/org/alfresco/web/bean/users/SpaceUsersBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserConsoleDialog.java b/war/src/main/java/org/alfresco/web/bean/users/UserConsoleDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserConsoleDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/UserConsoleDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserMembersBean.java b/war/src/main/java/org/alfresco/web/bean/users/UserMembersBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserMembersBean.java
rename to war/src/main/java/org/alfresco/web/bean/users/UserMembersBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserPreferencesBean.java b/war/src/main/java/org/alfresco/web/bean/users/UserPreferencesBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserPreferencesBean.java
rename to war/src/main/java/org/alfresco/web/bean/users/UserPreferencesBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserProfileDialog.java b/war/src/main/java/org/alfresco/web/bean/users/UserProfileDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserProfileDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/UserProfileDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserShortcutsBean.java b/war/src/main/java/org/alfresco/web/bean/users/UserShortcutsBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UserShortcutsBean.java
rename to war/src/main/java/org/alfresco/web/bean/users/UserShortcutsBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UsersBeanProperties.java b/war/src/main/java/org/alfresco/web/bean/users/UsersBeanProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UsersBeanProperties.java
rename to war/src/main/java/org/alfresco/web/bean/users/UsersBeanProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UsersDialog.java b/war/src/main/java/org/alfresco/web/bean/users/UsersDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/users/UsersDialog.java
rename to war/src/main/java/org/alfresco/web/bean/users/UsersDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java b/war/src/main/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/war/src/main/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/BaseWizardBean.java b/war/src/main/java/org/alfresco/web/bean/wizard/BaseWizardBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/BaseWizardBean.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/BaseWizardBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/IWizardBean.java b/war/src/main/java/org/alfresco/web/bean/wizard/IWizardBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/IWizardBean.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/IWizardBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/war/src/main/java/org/alfresco/web/bean/wizard/NewUserWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/NewUserWizard.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/NewUserWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/WizardManager.java b/war/src/main/java/org/alfresco/web/bean/wizard/WizardManager.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/WizardManager.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/WizardManager.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/WizardState.java b/war/src/main/java/org/alfresco/web/bean/wizard/WizardState.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/wizard/WizardState.java
rename to war/src/main/java/org/alfresco/web/bean/wizard/WizardState.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/CancelWorkflowDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/CancelWorkflowDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/CancelWorkflowDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/CancelWorkflowDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ReassignTaskDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/ReassignTaskDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ReassignTaskDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/ReassignTaskDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ReassignWorkItemDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/ReassignWorkItemDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ReassignWorkItemDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/ReassignWorkItemDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java b/war/src/main/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java b/war/src/main/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/war/src/main/java/org/alfresco/web/bean/workflow/WorkflowBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowBean.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/WorkflowBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowConsoleBean.java b/war/src/main/java/org/alfresco/web/bean/workflow/WorkflowConsoleBean.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowConsoleBean.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/WorkflowConsoleBean.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java b/war/src/main/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowUtil.java b/war/src/main/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
rename to war/src/main/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ActionsConfigElement.java b/war/src/main/java/org/alfresco/web/config/ActionsConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ActionsConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/ActionsConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ActionsElementReader.java b/war/src/main/java/org/alfresco/web/config/ActionsElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ActionsElementReader.java
rename to war/src/main/java/org/alfresco/web/config/ActionsElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/AdvancedSearchConfigElement.java b/war/src/main/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/AdvancedSearchElementReader.java b/war/src/main/java/org/alfresco/web/config/AdvancedSearchElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/AdvancedSearchElementReader.java
rename to war/src/main/java/org/alfresco/web/config/AdvancedSearchElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/AspectEvaluator.java b/war/src/main/java/org/alfresco/web/config/AspectEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/AspectEvaluator.java
rename to war/src/main/java/org/alfresco/web/config/AspectEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ClientConfigElement.java b/war/src/main/java/org/alfresco/web/config/ClientConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ClientConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/ClientConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ClientElementReader.java b/war/src/main/java/org/alfresco/web/config/ClientElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ClientElementReader.java
rename to war/src/main/java/org/alfresco/web/config/ClientElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/CommandServletConfigElement.java b/war/src/main/java/org/alfresco/web/config/CommandServletConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/CommandServletConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/CommandServletConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/CommandServletElementReader.java b/war/src/main/java/org/alfresco/web/config/CommandServletElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/CommandServletElementReader.java
rename to war/src/main/java/org/alfresco/web/config/CommandServletElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ConfigAdminInterpreter.java b/war/src/main/java/org/alfresco/web/config/ConfigAdminInterpreter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ConfigAdminInterpreter.java
rename to war/src/main/java/org/alfresco/web/config/ConfigAdminInterpreter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/DashboardsConfigElement.java b/war/src/main/java/org/alfresco/web/config/DashboardsConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/DashboardsConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/DashboardsConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/DashboardsElementReader.java b/war/src/main/java/org/alfresco/web/config/DashboardsElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/DashboardsElementReader.java
rename to war/src/main/java/org/alfresco/web/config/DashboardsElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/DialogsConfigElement.java b/war/src/main/java/org/alfresco/web/config/DialogsConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/DialogsConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/DialogsConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/DialogsElementReader.java b/war/src/main/java/org/alfresco/web/config/DialogsElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/DialogsElementReader.java
rename to war/src/main/java/org/alfresco/web/config/DialogsElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/LanguagesConfigElement.java b/war/src/main/java/org/alfresco/web/config/LanguagesConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/LanguagesConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/LanguagesConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/LanguagesElementReader.java b/war/src/main/java/org/alfresco/web/config/LanguagesElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/LanguagesElementReader.java
rename to war/src/main/java/org/alfresco/web/config/LanguagesElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationConfigElement.java b/war/src/main/java/org/alfresco/web/config/NavigationConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/NavigationConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationElementReader.java b/war/src/main/java/org/alfresco/web/config/NavigationElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationElementReader.java
rename to war/src/main/java/org/alfresco/web/config/NavigationElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationResult.java b/war/src/main/java/org/alfresco/web/config/NavigationResult.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/NavigationResult.java
rename to war/src/main/java/org/alfresco/web/config/NavigationResult.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/NodeTypeEvaluator.java b/war/src/main/java/org/alfresco/web/config/NodeTypeEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/NodeTypeEvaluator.java
rename to war/src/main/java/org/alfresco/web/config/NodeTypeEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/PathEvaluator.java b/war/src/main/java/org/alfresco/web/config/PathEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/PathEvaluator.java
rename to war/src/main/java/org/alfresco/web/config/PathEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/PropertySheetConfigElement.java b/war/src/main/java/org/alfresco/web/config/PropertySheetConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/PropertySheetConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/PropertySheetConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/PropertySheetElementReader.java b/war/src/main/java/org/alfresco/web/config/PropertySheetElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/PropertySheetElementReader.java
rename to war/src/main/java/org/alfresco/web/config/PropertySheetElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/SidebarConfigElement.java b/war/src/main/java/org/alfresco/web/config/SidebarConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/SidebarConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/SidebarConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/SidebarElementReader.java b/war/src/main/java/org/alfresco/web/config/SidebarElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/SidebarElementReader.java
rename to war/src/main/java/org/alfresco/web/config/SidebarElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ViewsConfigElement.java b/war/src/main/java/org/alfresco/web/config/ViewsConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ViewsConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/ViewsConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/ViewsElementReader.java b/war/src/main/java/org/alfresco/web/config/ViewsElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/ViewsElementReader.java
rename to war/src/main/java/org/alfresco/web/config/ViewsElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/WebClientConfigBootstrap.java b/war/src/main/java/org/alfresco/web/config/WebClientConfigBootstrap.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/WebClientConfigBootstrap.java
rename to war/src/main/java/org/alfresco/web/config/WebClientConfigBootstrap.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/WizardsConfigElement.java b/war/src/main/java/org/alfresco/web/config/WizardsConfigElement.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/WizardsConfigElement.java
rename to war/src/main/java/org/alfresco/web/config/WizardsConfigElement.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/config/WizardsElementReader.java b/war/src/main/java/org/alfresco/web/config/WizardsElementReader.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/config/WizardsElementReader.java
rename to war/src/main/java/org/alfresco/web/config/WizardsElementReader.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/data/DynamicResolver.java b/war/src/main/java/org/alfresco/web/data/DynamicResolver.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/data/DynamicResolver.java
rename to war/src/main/java/org/alfresco/web/data/DynamicResolver.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/data/IDataContainer.java b/war/src/main/java/org/alfresco/web/data/IDataContainer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/data/IDataContainer.java
rename to war/src/main/java/org/alfresco/web/data/IDataContainer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/data/MergeSort.java b/war/src/main/java/org/alfresco/web/data/MergeSort.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/data/MergeSort.java
rename to war/src/main/java/org/alfresco/web/data/MergeSort.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/data/QuickSort.java b/war/src/main/java/org/alfresco/web/data/QuickSort.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/data/QuickSort.java
rename to war/src/main/java/org/alfresco/web/data/QuickSort.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/data/Sort.java b/war/src/main/java/org/alfresco/web/data/Sort.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/data/Sort.java
rename to war/src/main/java/org/alfresco/web/data/Sort.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/AbstractAuthenticationHandler.java b/war/src/main/java/org/alfresco/web/sharepoint/auth/AbstractAuthenticationHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/AbstractAuthenticationHandler.java
rename to war/src/main/java/org/alfresco/web/sharepoint/auth/AbstractAuthenticationHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java b/war/src/main/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java
rename to war/src/main/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/kerberos/KerberosAuthenticationHandler.java b/war/src/main/java/org/alfresco/web/sharepoint/auth/kerberos/KerberosAuthenticationHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/kerberos/KerberosAuthenticationHandler.java
rename to war/src/main/java/org/alfresco/web/sharepoint/auth/kerberos/KerberosAuthenticationHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/ntlm/NtlmAuthenticationHandler.java b/war/src/main/java/org/alfresco/web/sharepoint/auth/ntlm/NtlmAuthenticationHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/sharepoint/auth/ntlm/NtlmAuthenticationHandler.java
rename to war/src/main/java/org/alfresco/web/sharepoint/auth/ntlm/NtlmAuthenticationHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/ComponentConstants.java b/war/src/main/java/org/alfresco/web/ui/common/ComponentConstants.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/ComponentConstants.java
rename to war/src/main/java/org/alfresco/web/ui/common/ComponentConstants.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/NodeListUtils.java b/war/src/main/java/org/alfresco/web/ui/common/NodeListUtils.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/NodeListUtils.java
rename to war/src/main/java/org/alfresco/web/ui/common/NodeListUtils.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/NodePropertyComparator.java b/war/src/main/java/org/alfresco/web/ui/common/NodePropertyComparator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/NodePropertyComparator.java
rename to war/src/main/java/org/alfresco/web/ui/common/NodePropertyComparator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/PanelGenerator.java b/war/src/main/java/org/alfresco/web/ui/common/PanelGenerator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/PanelGenerator.java
rename to war/src/main/java/org/alfresco/web/ui/common/PanelGenerator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/ReportedException.java b/war/src/main/java/org/alfresco/web/ui/common/ReportedException.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/ReportedException.java
rename to war/src/main/java/org/alfresco/web/ui/common/ReportedException.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/SortableSelectItem.java b/war/src/main/java/org/alfresco/web/ui/common/SortableSelectItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/SortableSelectItem.java
rename to war/src/main/java/org/alfresco/web/ui/common/SortableSelectItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/Utils.java b/war/src/main/java/org/alfresco/web/ui/common/Utils.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/Utils.java
rename to war/src/main/java/org/alfresco/web/ui/common/Utils.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/WebResources.java b/war/src/main/java/org/alfresco/web/ui/common/WebResources.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/WebResources.java
rename to war/src/main/java/org/alfresco/web/ui/common/WebResources.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java b/war/src/main/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIActionLink.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIActionLink.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIActionLink.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIActionLink.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIGenericPicker.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIImagePicker.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIImagePicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIImagePicker.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIImagePicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIListItem.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIListItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIListItem.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIListItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIListItems.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIListItems.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIListItems.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIListItems.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIMenu.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIMenu.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIMenu.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIMenu.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIModeList.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIModeList.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIModeList.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIModeList.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIOutputText.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIOutputText.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIOutputText.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIOutputText.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIPanel.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIPanel.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIPanel.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIPanel.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UISelectList.java b/war/src/main/java/org/alfresco/web/ui/common/component/UISelectList.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UISelectList.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UISelectList.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIStatusMessage.java b/war/src/main/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UploadInput.java b/war/src/main/java/org/alfresco/web/ui/common/component/UploadInput.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/UploadInput.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/UploadInput.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIColumn.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/UIColumn.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIColumn.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/UIColumn.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIDataPager.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/UIRichList.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UIRichList.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/UIRichList.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UISortLink.java b/war/src/main/java/org/alfresco/web/ui/common/component/data/UISortLink.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/data/UISortLink.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/data/UISortLink.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java b/war/src/main/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDescription.java b/war/src/main/java/org/alfresco/web/ui/common/component/description/UIDescription.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDescription.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/description/UIDescription.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java b/war/src/main/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java b/war/src/main/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java b/war/src/main/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java b/war/src/main/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java b/war/src/main/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java b/war/src/main/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java b/war/src/main/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java
rename to war/src/main/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java b/war/src/main/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java
rename to war/src/main/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/MultiValueConverter.java b/war/src/main/java/org/alfresco/web/ui/common/converter/MultiValueConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/MultiValueConverter.java
rename to war/src/main/java/org/alfresco/web/ui/common/converter/MultiValueConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java b/war/src/main/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
rename to war/src/main/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioPanelRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioPanelRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioPanelRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioPanelRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java b/war/src/main/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ErrorsTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ErrorsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ErrorsTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ErrorsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioPanelTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioPanelTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioPanelTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioPanelTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ListItemTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ListItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ListItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ListItemTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ListItemsTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/MenuTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/MenuTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/MenuTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/MenuTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ModeListTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/ModeListTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/ModeListTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/ModeListTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/MultiValueConverterTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/MultiValueConverterTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/MultiValueConverterTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/MultiValueConverterTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/OutputTextTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/OutputTextTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/OutputTextTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/OutputTextTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/PanelTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/PanelTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/PanelTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/PanelTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/SelectListTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/SelectListTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/SelectListTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/SelectListTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/UploadInputTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/UploadInputTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/UploadInputTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/UploadInputTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/RichListTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/RepositoryPropertiesTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/RepositoryPropertiesTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/RepositoryPropertiesTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/RepositoryPropertiesTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/RepoConstants.java b/war/src/main/java/org/alfresco/web/ui/repo/RepoConstants.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/RepoConstants.java
rename to war/src/main/java/org/alfresco/web/ui/repo/RepoConstants.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/WebResources.java b/war/src/main/java/org/alfresco/web/ui/repo/WebResources.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/WebResources.java
rename to war/src/main/java/org/alfresco/web/ui/repo/WebResources.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java b/war/src/main/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIActions.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIActions.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIActions.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIActions.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxCategoryPicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxCategoryPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxCategoryPicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxCategoryPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFolderPicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFolderPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFolderPicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxFolderPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICategorySelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UICategorySelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICategorySelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UICategorySelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIContentSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIDialogButtons.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UILanguageSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UILanguageSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UILanguageSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UILanguageSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UILockIcon.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UILockIcon.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UILockIcon.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UILockIcon.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIMimeTypeSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIMimeTypeSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIMimeTypeSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIMimeTypeSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINavigator.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UINavigator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINavigator.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UINavigator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeInfo.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UINodeInfo.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodePath.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UINodePath.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodePath.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UINodePath.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISidebar.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UISidebar.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISidebar.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UISidebar.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIStoreSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIStoreSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIStoreSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIStoreSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UITagSelector.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UITagSelector.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UITagSelector.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UITagSelector.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UITree.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UITree.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UITree.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UITree.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIUserGroupPicker.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIUserGroupPicker.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIUserGroupPicker.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIUserGroupPicker.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java b/war/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/evaluator/ActionInstanceEvaluator.java b/war/src/main/java/org/alfresco/web/ui/repo/component/evaluator/ActionInstanceEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/evaluator/ActionInstanceEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/evaluator/ActionInstanceEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java b/war/src/main/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIProperty.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UISeparator.java b/war/src/main/java/org/alfresco/web/ui/repo/component/property/UISeparator.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/property/UISeparator.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/property/UISeparator.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java b/war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java b/war/src/main/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/template/UITemplate.java b/war/src/main/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
rename to war/src/main/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java b/war/src/main/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
rename to war/src/main/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/DisplayPathConverter.java b/war/src/main/java/org/alfresco/web/ui/repo/converter/DisplayPathConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/DisplayPathConverter.java
rename to war/src/main/java/org/alfresco/web/ui/repo/converter/DisplayPathConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java b/war/src/main/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
rename to war/src/main/java/org/alfresco/web/ui/repo/converter/LanguageConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java b/war/src/main/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java
rename to war/src/main/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueFieldRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueFieldRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueFieldRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueFieldRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueSelectorRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueSelectorRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueSelectorRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/MultiValueSelectorRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextAreaRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextAreaRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextAreaRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextAreaRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/MultilingualTextRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/YahooTreeRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/YahooTreeRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/YahooTreeRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/YahooTreeRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/property/PropertySheetItemRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java b/war/src/main/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java
rename to war/src/main/java/org/alfresco/web/ui/repo/renderer/property/SeparatorRenderer.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ActionsTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/ActionsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ActionsTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/ActionsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxCategorySelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxCategorySelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxCategorySelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxCategorySelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFileSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFileSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFileSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFileSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFolderSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFolderSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFolderSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxFolderSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxItemSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxItemSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxItemSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxItemSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxTagSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxTagSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/AjaxTagSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/AjaxTagSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/BaseMultiValueTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/BaseMultiValueTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/BaseMultiValueTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/BaseMultiValueTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CategoryBrowserTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/CategoryBrowserTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CategoryBrowserTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/CategoryBrowserTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CharsetSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/CharsetSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/CharsetSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/CharsetSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ContentSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/ContentSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ContentSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/ContentSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/DialogButtonsTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/DialogButtonsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/DialogButtonsTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/DialogButtonsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LanguageSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/LanguageSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LanguageSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/LanguageSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LoadBundleTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/LoadBundleTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LoadBundleTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/LoadBundleTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LockIconTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/LockIconTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/LockIconTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/LockIconTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MimeTypeSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/MimeTypeSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MimeTypeSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/MimeTypeSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueFieldTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueFieldTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueFieldTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueFieldTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/MultiValueSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NavigatorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/NavigatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NavigatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/NavigatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeInfoTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/NodeInfoTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeInfoTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/NodeInfoTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodePathTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeWorkflowInfoTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/NodeWorkflowInfoTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/NodeWorkflowInfoTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/NodeWorkflowInfoTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/OpenSearchTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/OpenSearchTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/OpenSearchTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/OpenSearchTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/PageTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/PageTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/PageTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/PageTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SidebarTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/SidebarTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SidebarTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/SidebarTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/TemplateTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/UserGroupPickerTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/UserGroupPickerTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/UserGroupPickerTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/UserGroupPickerTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WebProjectFolderSelectorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/WebProjectFolderSelectorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WebProjectFolderSelectorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/WebProjectFolderSelectorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowHistoryTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowHistoryTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowHistoryTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowHistoryTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/YahooTreeTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/YahooTreeTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/YahooTreeTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/YahooTreeTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/ActionInstanceEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/ActionInstanceEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/ActionInstanceEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/ActionInstanceEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
diff --git a/alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java b/war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
similarity index 100%
rename from alfresco-content-repository/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
rename to war/src/main/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml b/war/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
rename to war/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter.properties b/war/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter.properties
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter.properties
rename to war/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter.properties
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml b/war/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml
rename to war/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml b/war/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
rename to war/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties b/war/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties
rename to war/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter-context.xml b/war/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter-context.xml
rename to war/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter-context.xml
diff --git a/alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter.properties b/war/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter.properties
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter.properties
rename to war/src/main/resources/alfresco/subsystems/Authentication/passthru/ntlm-filter.properties
diff --git a/alfresco-content-repository/src/main/resources/alfresco/version.properties b/war/src/main/resources/alfresco/version.properties
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/version.properties
rename to war/src/main/resources/alfresco/version.properties
diff --git a/alfresco-content-repository/src/main/resources/alfresco/web-client-application-context.xml b/war/src/main/resources/alfresco/web-client-application-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/web-client-application-context.xml
rename to war/src/main/resources/alfresco/web-client-application-context.xml
diff --git a/alfresco-content-repository/src/main/resources/alfresco/web-client-security-config.xml b/war/src/main/resources/alfresco/web-client-security-config.xml
similarity index 100%
rename from alfresco-content-repository/src/main/resources/alfresco/web-client-security-config.xml
rename to war/src/main/resources/alfresco/web-client-security-config.xml
diff --git a/alfresco-content-repository/src/main/webapp/META-INF/context.xml b/war/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/META-INF/context.xml
rename to war/src/main/webapp/META-INF/context.xml
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template b/war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
rename to war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template b/war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
rename to war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template b/war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
rename to war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template b/war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
rename to war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template b/war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
rename to war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template b/war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
rename to war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/jboss-web.xml b/war/src/main/webapp/WEB-INF/jboss-web.xml
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/jboss-web.xml
rename to war/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/web-application-context.xml b/war/src/main/webapp/WEB-INF/web-application-context.xml
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/web-application-context.xml
rename to war/src/main/webapp/WEB-INF/web-application-context.xml
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/web.xml
rename to war/src/main/webapp/WEB-INF/web.xml
diff --git a/alfresco-content-repository/src/main/webapp/WEB-INF/weblogic.xml b/war/src/main/webapp/WEB-INF/weblogic.xml
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/WEB-INF/weblogic.xml
rename to war/src/main/webapp/WEB-INF/weblogic.xml
diff --git a/alfresco-content-repository/src/main/webapp/admin/css/admin.css b/war/src/main/webapp/admin/css/admin.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/admin/css/admin.css
rename to war/src/main/webapp/admin/css/admin.css
diff --git a/alfresco-content-repository/src/main/webapp/admin/images/disabled.gif b/war/src/main/webapp/admin/images/disabled.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/admin/images/disabled.gif
rename to war/src/main/webapp/admin/images/disabled.gif
diff --git a/alfresco-content-repository/src/main/webapp/admin/images/enabled.gif b/war/src/main/webapp/admin/images/enabled.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/admin/images/enabled.gif
rename to war/src/main/webapp/admin/images/enabled.gif
diff --git a/alfresco-content-repository/src/main/webapp/admin/images/upload.png b/war/src/main/webapp/admin/images/upload.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/admin/images/upload.png
rename to war/src/main/webapp/admin/images/upload.png
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/css/style.css b/war/src/main/webapp/cmis-browser-app/css/style.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/css/style.css
rename to war/src/main/webapp/cmis-browser-app/css/style.css
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/apache_chemistry.png b/war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
rename to war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png b/war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
rename to war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/cmis.png b/war/src/main/webapp/cmis-browser-app/images/cmis.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/cmis.png
rename to war/src/main/webapp/cmis-browser-app/images/cmis.png
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/divider.jpg b/war/src/main/webapp/cmis-browser-app/images/divider.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/divider.jpg
rename to war/src/main/webapp/cmis-browser-app/images/divider.jpg
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/document.gif b/war/src/main/webapp/cmis-browser-app/images/document.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/document.gif
rename to war/src/main/webapp/cmis-browser-app/images/document.gif
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/folder-yellow.gif b/war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
rename to war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/folder.gif b/war/src/main/webapp/cmis-browser-app/images/folder.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/folder.gif
rename to war/src/main/webapp/cmis-browser-app/images/folder.gif
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/header_bg.jpg b/war/src/main/webapp/cmis-browser-app/images/header_bg.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/header_bg.jpg
rename to war/src/main/webapp/cmis-browser-app/images/header_bg.jpg
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/nav_bg.jpg b/war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
rename to war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/surf-logo.png b/war/src/main/webapp/cmis-browser-app/images/surf-logo.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/surf-logo.png
rename to war/src/main/webapp/cmis-browser-app/images/surf-logo.png
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/table-header.jpg b/war/src/main/webapp/cmis-browser-app/images/table-header.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/table-header.jpg
rename to war/src/main/webapp/cmis-browser-app/images/table-header.jpg
diff --git a/alfresco-content-repository/src/main/webapp/cmis-browser-app/images/up.gif b/war/src/main/webapp/cmis-browser-app/images/up.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmis-browser-app/images/up.gif
rename to war/src/main/webapp/cmis-browser-app/images/up.gif
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/browser.css b/war/src/main/webapp/cmisfs/browser/browser.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/browser.css
rename to war/src/main/webapp/cmisfs/browser/browser.css
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/cmis.png b/war/src/main/webapp/cmisfs/browser/cmis.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/cmis.png
rename to war/src/main/webapp/cmisfs/browser/cmis.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/document.png b/war/src/main/webapp/cmisfs/browser/document.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/document.png
rename to war/src/main/webapp/cmisfs/browser/document.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/folder.png b/war/src/main/webapp/cmisfs/browser/folder.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/folder.png
rename to war/src/main/webapp/cmisfs/browser/folder.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/policy.png b/war/src/main/webapp/cmisfs/browser/policy.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/policy.png
rename to war/src/main/webapp/cmisfs/browser/policy.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/relationship.png b/war/src/main/webapp/cmisfs/browser/relationship.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/relationship.png
rename to war/src/main/webapp/cmisfs/browser/relationship.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/type.png b/war/src/main/webapp/cmisfs/browser/type.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/type.png
rename to war/src/main/webapp/cmisfs/browser/type.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/browser/unknown.png b/war/src/main/webapp/cmisfs/browser/unknown.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/browser/unknown.png
rename to war/src/main/webapp/cmisfs/browser/unknown.png
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/acl.xsl b/war/src/main/webapp/cmisfs/stylesheets/acl.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/acl.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/acl.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/actions.xsl b/war/src/main/webapp/cmisfs/stylesheets/actions.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/actions.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/actions.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/entry.xsl b/war/src/main/webapp/cmisfs/stylesheets/entry.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/entry.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/entry.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/feed.xsl b/war/src/main/webapp/cmisfs/stylesheets/feed.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/feed.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/feed.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/relationships.xsl b/war/src/main/webapp/cmisfs/stylesheets/relationships.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/relationships.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/relationships.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/renditions.xsl b/war/src/main/webapp/cmisfs/stylesheets/renditions.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/renditions.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/renditions.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/service.xsl b/war/src/main/webapp/cmisfs/stylesheets/service.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/service.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/service.xsl
diff --git a/alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl b/war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
rename to war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
diff --git a/alfresco-content-repository/src/main/webapp/css/alfresco.css b/war/src/main/webapp/css/alfresco.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/alfresco.css
rename to war/src/main/webapp/css/alfresco.css
diff --git a/alfresco-content-repository/src/main/webapp/css/main.css b/war/src/main/webapp/css/main.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/main.css
rename to war/src/main/webapp/css/main.css
diff --git a/alfresco-content-repository/src/main/webapp/css/opensans.woff b/war/src/main/webapp/css/opensans.woff
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/opensans.woff
rename to war/src/main/webapp/css/opensans.woff
diff --git a/alfresco-content-repository/src/main/webapp/css/opensansbold.woff b/war/src/main/webapp/css/opensansbold.woff
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/opensansbold.woff
rename to war/src/main/webapp/css/opensansbold.woff
diff --git a/alfresco-content-repository/src/main/webapp/css/opensanscondensed.woff b/war/src/main/webapp/css/opensanscondensed.woff
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/opensanscondensed.woff
rename to war/src/main/webapp/css/opensanscondensed.woff
diff --git a/alfresco-content-repository/src/main/webapp/css/opensearch.css b/war/src/main/webapp/css/opensearch.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/opensearch.css
rename to war/src/main/webapp/css/opensearch.css
diff --git a/alfresco-content-repository/src/main/webapp/css/picker.css b/war/src/main/webapp/css/picker.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/picker.css
rename to war/src/main/webapp/css/picker.css
diff --git a/alfresco-content-repository/src/main/webapp/css/reset.css b/war/src/main/webapp/css/reset.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/reset.css
rename to war/src/main/webapp/css/reset.css
diff --git a/alfresco-content-repository/src/main/webapp/css/webscripts.css b/war/src/main/webapp/css/webscripts.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/webscripts.css
rename to war/src/main/webapp/css/webscripts.css
diff --git a/alfresco-content-repository/src/main/webapp/css/yahoo-tree.css b/war/src/main/webapp/css/yahoo-tree.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/yahoo-tree.css
rename to war/src/main/webapp/css/yahoo-tree.css
diff --git a/alfresco-content-repository/src/main/webapp/css/yui-3.3.0-dependencies.css b/war/src/main/webapp/css/yui-3.3.0-dependencies.css
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/css/yui-3.3.0-dependencies.css
rename to war/src/main/webapp/css/yui-3.3.0-dependencies.css
diff --git a/alfresco-content-repository/src/main/webapp/favicon.ico b/war/src/main/webapp/favicon.ico
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/favicon.ico
rename to war/src/main/webapp/favicon.ico
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/_default.gif b/war/src/main/webapp/images/filetypes/_default.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/_default.gif
rename to war/src/main/webapp/images/filetypes/_default.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/_default.png b/war/src/main/webapp/images/filetypes/_default.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/_default.png
rename to war/src/main/webapp/images/filetypes/_default.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/acp.gif b/war/src/main/webapp/images/filetypes/acp.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/acp.gif
rename to war/src/main/webapp/images/filetypes/acp.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/asf.gif b/war/src/main/webapp/images/filetypes/asf.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/asf.gif
rename to war/src/main/webapp/images/filetypes/asf.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/avi.gif b/war/src/main/webapp/images/filetypes/avi.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/avi.gif
rename to war/src/main/webapp/images/filetypes/avi.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/bmp.gif b/war/src/main/webapp/images/filetypes/bmp.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/bmp.gif
rename to war/src/main/webapp/images/filetypes/bmp.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/bmp.png b/war/src/main/webapp/images/filetypes/bmp.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/bmp.png
rename to war/src/main/webapp/images/filetypes/bmp.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/csv.gif b/war/src/main/webapp/images/filetypes/csv.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/csv.gif
rename to war/src/main/webapp/images/filetypes/csv.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/doc.gif b/war/src/main/webapp/images/filetypes/doc.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/doc.gif
rename to war/src/main/webapp/images/filetypes/doc.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/doc.png b/war/src/main/webapp/images/filetypes/doc.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/doc.png
rename to war/src/main/webapp/images/filetypes/doc.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/docx.gif b/war/src/main/webapp/images/filetypes/docx.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/docx.gif
rename to war/src/main/webapp/images/filetypes/docx.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/docx.png b/war/src/main/webapp/images/filetypes/docx.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/docx.png
rename to war/src/main/webapp/images/filetypes/docx.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/eml.gif b/war/src/main/webapp/images/filetypes/eml.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/eml.gif
rename to war/src/main/webapp/images/filetypes/eml.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/exe.gif b/war/src/main/webapp/images/filetypes/exe.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/exe.gif
rename to war/src/main/webapp/images/filetypes/exe.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/ftl.gif b/war/src/main/webapp/images/filetypes/ftl.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/ftl.gif
rename to war/src/main/webapp/images/filetypes/ftl.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/gif.gif b/war/src/main/webapp/images/filetypes/gif.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/gif.gif
rename to war/src/main/webapp/images/filetypes/gif.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/gif.png b/war/src/main/webapp/images/filetypes/gif.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/gif.png
rename to war/src/main/webapp/images/filetypes/gif.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/htm.gif b/war/src/main/webapp/images/filetypes/htm.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/htm.gif
rename to war/src/main/webapp/images/filetypes/htm.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/htm.png b/war/src/main/webapp/images/filetypes/htm.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/htm.png
rename to war/src/main/webapp/images/filetypes/htm.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/html.gif b/war/src/main/webapp/images/filetypes/html.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/html.gif
rename to war/src/main/webapp/images/filetypes/html.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/html.png b/war/src/main/webapp/images/filetypes/html.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/html.png
rename to war/src/main/webapp/images/filetypes/html.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/jpg.gif b/war/src/main/webapp/images/filetypes/jpg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/jpg.gif
rename to war/src/main/webapp/images/filetypes/jpg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/jpg.png b/war/src/main/webapp/images/filetypes/jpg.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/jpg.png
rename to war/src/main/webapp/images/filetypes/jpg.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/js.gif b/war/src/main/webapp/images/filetypes/js.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/js.gif
rename to war/src/main/webapp/images/filetypes/js.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/lnk.gif b/war/src/main/webapp/images/filetypes/lnk.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/lnk.gif
rename to war/src/main/webapp/images/filetypes/lnk.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/mp2.gif b/war/src/main/webapp/images/filetypes/mp2.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/mp2.gif
rename to war/src/main/webapp/images/filetypes/mp2.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/mp3.gif b/war/src/main/webapp/images/filetypes/mp3.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/mp3.gif
rename to war/src/main/webapp/images/filetypes/mp3.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/mp4.gif b/war/src/main/webapp/images/filetypes/mp4.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/mp4.gif
rename to war/src/main/webapp/images/filetypes/mp4.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/mpeg.gif b/war/src/main/webapp/images/filetypes/mpeg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/mpeg.gif
rename to war/src/main/webapp/images/filetypes/mpeg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/mpg.gif b/war/src/main/webapp/images/filetypes/mpg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/mpg.gif
rename to war/src/main/webapp/images/filetypes/mpg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/msg.gif b/war/src/main/webapp/images/filetypes/msg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/msg.gif
rename to war/src/main/webapp/images/filetypes/msg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/odf.gif b/war/src/main/webapp/images/filetypes/odf.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/odf.gif
rename to war/src/main/webapp/images/filetypes/odf.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/odg.gif b/war/src/main/webapp/images/filetypes/odg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/odg.gif
rename to war/src/main/webapp/images/filetypes/odg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/odp.gif b/war/src/main/webapp/images/filetypes/odp.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/odp.gif
rename to war/src/main/webapp/images/filetypes/odp.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/ods.gif b/war/src/main/webapp/images/filetypes/ods.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/ods.gif
rename to war/src/main/webapp/images/filetypes/ods.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/odt.gif b/war/src/main/webapp/images/filetypes/odt.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/odt.gif
rename to war/src/main/webapp/images/filetypes/odt.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/pdf.gif b/war/src/main/webapp/images/filetypes/pdf.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/pdf.gif
rename to war/src/main/webapp/images/filetypes/pdf.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/pdf.png b/war/src/main/webapp/images/filetypes/pdf.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/pdf.png
rename to war/src/main/webapp/images/filetypes/pdf.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/png.gif b/war/src/main/webapp/images/filetypes/png.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/png.gif
rename to war/src/main/webapp/images/filetypes/png.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/png.png b/war/src/main/webapp/images/filetypes/png.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/png.png
rename to war/src/main/webapp/images/filetypes/png.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/ppt.gif b/war/src/main/webapp/images/filetypes/ppt.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/ppt.gif
rename to war/src/main/webapp/images/filetypes/ppt.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/ppt.png b/war/src/main/webapp/images/filetypes/ppt.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/ppt.png
rename to war/src/main/webapp/images/filetypes/ppt.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/pptx.gif b/war/src/main/webapp/images/filetypes/pptx.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/pptx.gif
rename to war/src/main/webapp/images/filetypes/pptx.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/pptx.png b/war/src/main/webapp/images/filetypes/pptx.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/pptx.png
rename to war/src/main/webapp/images/filetypes/pptx.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/psd.gif b/war/src/main/webapp/images/filetypes/psd.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/psd.gif
rename to war/src/main/webapp/images/filetypes/psd.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/rtf.gif b/war/src/main/webapp/images/filetypes/rtf.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/rtf.gif
rename to war/src/main/webapp/images/filetypes/rtf.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/shtml.gif b/war/src/main/webapp/images/filetypes/shtml.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/shtml.gif
rename to war/src/main/webapp/images/filetypes/shtml.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/swf.gif b/war/src/main/webapp/images/filetypes/swf.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/swf.gif
rename to war/src/main/webapp/images/filetypes/swf.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/tif.gif b/war/src/main/webapp/images/filetypes/tif.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/tif.gif
rename to war/src/main/webapp/images/filetypes/tif.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/tiff.gif b/war/src/main/webapp/images/filetypes/tiff.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/tiff.gif
rename to war/src/main/webapp/images/filetypes/tiff.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/txt.gif b/war/src/main/webapp/images/filetypes/txt.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/txt.gif
rename to war/src/main/webapp/images/filetypes/txt.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/txt.png b/war/src/main/webapp/images/filetypes/txt.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/txt.png
rename to war/src/main/webapp/images/filetypes/txt.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/url.gif b/war/src/main/webapp/images/filetypes/url.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/url.gif
rename to war/src/main/webapp/images/filetypes/url.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/wmv.gif b/war/src/main/webapp/images/filetypes/wmv.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/wmv.gif
rename to war/src/main/webapp/images/filetypes/wmv.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/wpd.gif b/war/src/main/webapp/images/filetypes/wpd.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/wpd.gif
rename to war/src/main/webapp/images/filetypes/wpd.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xdp.gif b/war/src/main/webapp/images/filetypes/xdp.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xdp.gif
rename to war/src/main/webapp/images/filetypes/xdp.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xdp.png b/war/src/main/webapp/images/filetypes/xdp.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xdp.png
rename to war/src/main/webapp/images/filetypes/xdp.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xls.gif b/war/src/main/webapp/images/filetypes/xls.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xls.gif
rename to war/src/main/webapp/images/filetypes/xls.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xls.png b/war/src/main/webapp/images/filetypes/xls.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xls.png
rename to war/src/main/webapp/images/filetypes/xls.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xlsx.gif b/war/src/main/webapp/images/filetypes/xlsx.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xlsx.gif
rename to war/src/main/webapp/images/filetypes/xlsx.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xlsx.png b/war/src/main/webapp/images/filetypes/xlsx.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xlsx.png
rename to war/src/main/webapp/images/filetypes/xlsx.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xml.gif b/war/src/main/webapp/images/filetypes/xml.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xml.gif
rename to war/src/main/webapp/images/filetypes/xml.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xsd.gif b/war/src/main/webapp/images/filetypes/xsd.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xsd.gif
rename to war/src/main/webapp/images/filetypes/xsd.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xsl.gif b/war/src/main/webapp/images/filetypes/xsl.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xsl.gif
rename to war/src/main/webapp/images/filetypes/xsl.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xslx.gif b/war/src/main/webapp/images/filetypes/xslx.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xslx.gif
rename to war/src/main/webapp/images/filetypes/xslx.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/xslx.png b/war/src/main/webapp/images/filetypes/xslx.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/xslx.png
rename to war/src/main/webapp/images/filetypes/xslx.png
diff --git a/alfresco-content-repository/src/main/webapp/images/filetypes/zip.gif b/war/src/main/webapp/images/filetypes/zip.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/filetypes/zip.gif
rename to war/src/main/webapp/images/filetypes/zip.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/sort_down.gif b/war/src/main/webapp/images/icons/sort_down.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/sort_down.gif
rename to war/src/main/webapp/images/icons/sort_down.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/sort_flat.gif b/war/src/main/webapp/images/icons/sort_flat.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/sort_flat.gif
rename to war/src/main/webapp/images/icons/sort_flat.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/sort_up.gif b/war/src/main/webapp/images/icons/sort_up.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/sort_up.gif
rename to war/src/main/webapp/images/icons/sort_up.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-16.gif b/war/src/main/webapp/images/icons/space-icon-cd-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-16.gif
rename to war/src/main/webapp/images/icons/space-icon-cd-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-16.png b/war/src/main/webapp/images/icons/space-icon-cd-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-16.png
rename to war/src/main/webapp/images/icons/space-icon-cd-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-64.png b/war/src/main/webapp/images/icons/space-icon-cd-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd-64.png
rename to war/src/main/webapp/images/icons/space-icon-cd-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd.gif b/war/src/main/webapp/images/icons/space-icon-cd.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-cd.gif
rename to war/src/main/webapp/images/icons/space-icon-cd.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-16.gif b/war/src/main/webapp/images/icons/space-icon-default-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-16.gif
rename to war/src/main/webapp/images/icons/space-icon-default-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-16.png b/war/src/main/webapp/images/icons/space-icon-default-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-16.png
rename to war/src/main/webapp/images/icons/space-icon-default-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-64.png b/war/src/main/webapp/images/icons/space-icon-default-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-default-64.png
rename to war/src/main/webapp/images/icons/space-icon-default-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-default.gif b/war/src/main/webapp/images/icons/space-icon-default.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-default.gif
rename to war/src/main/webapp/images/icons/space-icon-default.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-16.gif b/war/src/main/webapp/images/icons/space-icon-doc-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-16.gif
rename to war/src/main/webapp/images/icons/space-icon-doc-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-16.png b/war/src/main/webapp/images/icons/space-icon-doc-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-16.png
rename to war/src/main/webapp/images/icons/space-icon-doc-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-64.png b/war/src/main/webapp/images/icons/space-icon-doc-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc-64.png
rename to war/src/main/webapp/images/icons/space-icon-doc-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc.gif b/war/src/main/webapp/images/icons/space-icon-doc.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-doc.gif
rename to war/src/main/webapp/images/icons/space-icon-doc.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-16.gif b/war/src/main/webapp/images/icons/space-icon-image-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-16.gif
rename to war/src/main/webapp/images/icons/space-icon-image-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-16.png b/war/src/main/webapp/images/icons/space-icon-image-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-16.png
rename to war/src/main/webapp/images/icons/space-icon-image-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-64.png b/war/src/main/webapp/images/icons/space-icon-image-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-image-64.png
rename to war/src/main/webapp/images/icons/space-icon-image-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-image.gif b/war/src/main/webapp/images/icons/space-icon-image.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-image.gif
rename to war/src/main/webapp/images/icons/space-icon-image.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-link-16.gif b/war/src/main/webapp/images/icons/space-icon-link-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-link-16.gif
rename to war/src/main/webapp/images/icons/space-icon-link-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-link.gif b/war/src/main/webapp/images/icons/space-icon-link.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-link.gif
rename to war/src/main/webapp/images/icons/space-icon-link.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-16.gif b/war/src/main/webapp/images/icons/space-icon-pen-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-16.gif
rename to war/src/main/webapp/images/icons/space-icon-pen-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-16.png b/war/src/main/webapp/images/icons/space-icon-pen-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-16.png
rename to war/src/main/webapp/images/icons/space-icon-pen-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-64.png b/war/src/main/webapp/images/icons/space-icon-pen-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen-64.png
rename to war/src/main/webapp/images/icons/space-icon-pen-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen.gif b/war/src/main/webapp/images/icons/space-icon-pen.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-pen.gif
rename to war/src/main/webapp/images/icons/space-icon-pen.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-16.gif b/war/src/main/webapp/images/icons/space-icon-star-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-16.gif
rename to war/src/main/webapp/images/icons/space-icon-star-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-16.png b/war/src/main/webapp/images/icons/space-icon-star-16.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-16.png
rename to war/src/main/webapp/images/icons/space-icon-star-16.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-64.png b/war/src/main/webapp/images/icons/space-icon-star-64.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-star-64.png
rename to war/src/main/webapp/images/icons/space-icon-star-64.png
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-star.gif b/war/src/main/webapp/images/icons/space-icon-star.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-star.gif
rename to war/src/main/webapp/images/icons/space-icon-star.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-website-16.gif b/war/src/main/webapp/images/icons/space-icon-website-16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-website-16.gif
rename to war/src/main/webapp/images/icons/space-icon-website-16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/icons/space-icon-website.gif b/war/src/main/webapp/images/icons/space-icon-website.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/icons/space-icon-website.gif
rename to war/src/main/webapp/images/icons/space-icon-website.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoFadedBG.png b/war/src/main/webapp/images/logo/AlfrescoFadedBG.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoFadedBG.png
rename to war/src/main/webapp/images/logo/AlfrescoFadedBG.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo16.gif b/war/src/main/webapp/images/logo/AlfrescoLogo16.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo16.gif
rename to war/src/main/webapp/images/logo/AlfrescoLogo16.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo16.ico b/war/src/main/webapp/images/logo/AlfrescoLogo16.ico
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo16.ico
rename to war/src/main/webapp/images/logo/AlfrescoLogo16.ico
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo200.png b/war/src/main/webapp/images/logo/AlfrescoLogo200.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo200.png
rename to war/src/main/webapp/images/logo/AlfrescoLogo200.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32.gif b/war/src/main/webapp/images/logo/AlfrescoLogo32.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32.gif
rename to war/src/main/webapp/images/logo/AlfrescoLogo32.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32.png b/war/src/main/webapp/images/logo/AlfrescoLogo32.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32.png
rename to war/src/main/webapp/images/logo/AlfrescoLogo32.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif b/war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
rename to war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/alf_task_bg.png b/war/src/main/webapp/images/logo/alf_task_bg.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/alf_task_bg.png
rename to war/src/main/webapp/images/logo/alf_task_bg.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/alfresco3d.jpg b/war/src/main/webapp/images/logo/alfresco3d.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/alfresco3d.jpg
rename to war/src/main/webapp/images/logo/alfresco3d.jpg
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/alfresco_logo.gif b/war/src/main/webapp/images/logo/alfresco_logo.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/alfresco_logo.gif
rename to war/src/main/webapp/images/logo/alfresco_logo.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/asf_logo_wide.gif b/war/src/main/webapp/images/logo/asf_logo_wide.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/asf_logo_wide.gif
rename to war/src/main/webapp/images/logo/asf_logo_wide.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/cglib.png b/war/src/main/webapp/images/logo/cglib.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/cglib.png
rename to war/src/main/webapp/images/logo/cglib.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/cmis_logo.png b/war/src/main/webapp/images/logo/cmis_logo.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/cmis_logo.png
rename to war/src/main/webapp/images/logo/cmis_logo.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/cmis_logo_100.png b/war/src/main/webapp/images/logo/cmis_logo_100.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/cmis_logo_100.png
rename to war/src/main/webapp/images/logo/cmis_logo_100.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/eclipse_logo.jpg b/war/src/main/webapp/images/logo/eclipse_logo.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/eclipse_logo.jpg
rename to war/src/main/webapp/images/logo/eclipse_logo.jpg
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/freemarker.png b/war/src/main/webapp/images/logo/freemarker.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/freemarker.png
rename to war/src/main/webapp/images/logo/freemarker.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/hazelcast.png b/war/src/main/webapp/images/logo/hazelcast.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/hazelcast.png
rename to war/src/main/webapp/images/logo/hazelcast.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/ibatis.png b/war/src/main/webapp/images/logo/ibatis.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/ibatis.png
rename to war/src/main/webapp/images/logo/ibatis.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/jakarta-logo.gif b/war/src/main/webapp/images/logo/jakarta-logo.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/jakarta-logo.gif
rename to war/src/main/webapp/images/logo/jakarta-logo.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/java.gif b/war/src/main/webapp/images/logo/java.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/java.gif
rename to war/src/main/webapp/images/logo/java.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/jbosslogo.gif b/war/src/main/webapp/images/logo/jbosslogo.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/jbosslogo.gif
rename to war/src/main/webapp/images/logo/jbosslogo.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/jooreports.png b/war/src/main/webapp/images/logo/jooreports.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/jooreports.png
rename to war/src/main/webapp/images/logo/jooreports.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/libreoffice.png b/war/src/main/webapp/images/logo/libreoffice.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/libreoffice.png
rename to war/src/main/webapp/images/logo/libreoffice.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/logo.png b/war/src/main/webapp/images/logo/logo.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/logo.png
rename to war/src/main/webapp/images/logo/logo.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/lucene.gif b/war/src/main/webapp/images/logo/lucene.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/lucene.gif
rename to war/src/main/webapp/images/logo/lucene.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/mybatis.png b/war/src/main/webapp/images/logo/mybatis.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/mybatis.png
rename to war/src/main/webapp/images/logo/mybatis.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/myfaces.png b/war/src/main/webapp/images/logo/myfaces.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/myfaces.png
rename to war/src/main/webapp/images/logo/myfaces.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/pdfbox.gif b/war/src/main/webapp/images/logo/pdfbox.gif
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/pdfbox.gif
rename to war/src/main/webapp/images/logo/pdfbox.gif
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/sflogo.php.png b/war/src/main/webapp/images/logo/sflogo.php.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/sflogo.php.png
rename to war/src/main/webapp/images/logo/sflogo.php.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/solr.png b/war/src/main/webapp/images/logo/solr.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/solr.png
rename to war/src/main/webapp/images/logo/solr.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/spring_logo.jpg b/war/src/main/webapp/images/logo/spring_logo.jpg
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/spring_logo.jpg
rename to war/src/main/webapp/images/logo/spring_logo.jpg
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/subversion_logo.png b/war/src/main/webapp/images/logo/subversion_logo.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/subversion_logo.png
rename to war/src/main/webapp/images/logo/subversion_logo.png
diff --git a/alfresco-content-repository/src/main/webapp/images/logo/tinymce.png b/war/src/main/webapp/images/logo/tinymce.png
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/images/logo/tinymce.png
rename to war/src/main/webapp/images/logo/tinymce.png
diff --git a/alfresco-content-repository/src/main/webapp/index.jsp b/war/src/main/webapp/index.jsp
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/index.jsp
rename to war/src/main/webapp/index.jsp
diff --git a/alfresco-content-repository/src/main/webapp/scripts/FileSaver.js b/war/src/main/webapp/scripts/FileSaver.js
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/scripts/FileSaver.js
rename to war/src/main/webapp/scripts/FileSaver.js
diff --git a/alfresco-content-repository/src/main/webapp/scripts/smoothie.js b/war/src/main/webapp/scripts/smoothie.js
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/scripts/smoothie.js
rename to war/src/main/webapp/scripts/smoothie.js
diff --git a/alfresco-content-repository/src/main/webapp/scripts/yui-3.3.0-dependencies.js b/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js
similarity index 100%
rename from alfresco-content-repository/src/main/webapp/scripts/yui-3.3.0-dependencies.js
rename to war/src/main/webapp/scripts/yui-3.3.0-dependencies.js
diff --git a/alfresco-platform-community-distributionzip/pom.xml b/zip/pom.xml
similarity index 100%
rename from alfresco-platform-community-distributionzip/pom.xml
rename to zip/pom.xml
diff --git a/alfresco-platform-community-distributionzip/src/assemblies/distribution.xml b/zip/src/assemblies/distribution.xml
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/assemblies/distribution.xml
rename to zip/src/assemblies/distribution.xml
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/README.txt b/zip/src/main/resources/README.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/README.txt
rename to zip/src/main/resources/README.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/bin/apply_amps.bat b/zip/src/main/resources/bin/apply_amps.bat
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/bin/apply_amps.bat
rename to zip/src/main/resources/bin/apply_amps.bat
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/bin/apply_amps.sh b/zip/src/main/resources/bin/apply_amps.sh
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/bin/apply_amps.sh
rename to zip/src/main/resources/bin/apply_amps.sh
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/bin/clean_tomcat.bat b/zip/src/main/resources/bin/clean_tomcat.bat
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/bin/clean_tomcat.bat
rename to zip/src/main/resources/bin/clean_tomcat.bat
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/bin/clean_tomcat.sh b/zip/src/main/resources/bin/clean_tomcat.sh
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/bin/clean_tomcat.sh
rename to zip/src/main/resources/bin/clean_tomcat.sh
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache 2.0.txt b/zip/src/main/resources/licenses/3rd-party/Apache 2.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache 2.0.txt
rename to zip/src/main/resources/licenses/3rd-party/Apache 2.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt b/zip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
rename to zip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt b/zip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
rename to zip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt b/zip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
rename to zip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt b/zip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
rename to zip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt b/zip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
rename to zip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt b/zip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
rename to zip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt b/zip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
rename to zip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt b/zip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
rename to zip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt b/zip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
rename to zip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CPL 1.0.txt b/zip/src/main/resources/licenses/3rd-party/CPL 1.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/CPL 1.0.txt
rename to zip/src/main/resources/licenses/3rd-party/CPL 1.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt b/zip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
rename to zip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ICU License.txt b/zip/src/main/resources/licenses/3rd-party/ICU License.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ICU License.txt
rename to zip/src/main/resources/licenses/3rd-party/ICU License.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
rename to zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/JSON.txt b/zip/src/main/resources/licenses/3rd-party/JSON.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/JSON.txt
rename to zip/src/main/resources/licenses/3rd-party/JSON.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt b/zip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
rename to zip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL 3.txt b/zip/src/main/resources/licenses/3rd-party/LGPL 3.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL 3.txt
rename to zip/src/main/resources/licenses/3rd-party/LGPL 3.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt b/zip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
rename to zip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt b/zip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt b/zip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt b/zip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt b/zip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt b/zip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jquery.txt b/zip/src/main/resources/licenses/3rd-party/MIT-jquery.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jquery.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-jquery.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt b/zip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt b/zip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt b/zip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
rename to zip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MPL-1.1.txt b/zip/src/main/resources/licenses/3rd-party/MPL-1.1.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MPL-1.1.txt
rename to zip/src/main/resources/licenses/3rd-party/MPL-1.1.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MPL-2.0.txt b/zip/src/main/resources/licenses/3rd-party/MPL-2.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/MPL-2.0.txt
rename to zip/src/main/resources/licenses/3rd-party/MPL-2.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt b/zip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
rename to zip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun Public License.txt b/zip/src/main/resources/licenses/3rd-party/Sun Public License.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun Public License.txt
rename to zip/src/main/resources/licenses/3rd-party/Sun Public License.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt b/zip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
rename to zip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt b/zip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
rename to zip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt b/zip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
rename to zip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt b/zip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
rename to zip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/gpl-2.0.txt b/zip/src/main/resources/licenses/3rd-party/gpl-2.0.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/gpl-2.0.txt
rename to zip/src/main/resources/licenses/3rd-party/gpl-2.0.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/libreoffice.txt b/zip/src/main/resources/licenses/3rd-party/libreoffice.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/libreoffice.txt
rename to zip/src/main/resources/licenses/3rd-party/libreoffice.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/openssl.txt b/zip/src/main/resources/licenses/3rd-party/openssl.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/openssl.txt
rename to zip/src/main/resources/licenses/3rd-party/openssl.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/pdfium.txt b/zip/src/main/resources/licenses/3rd-party/pdfium.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/pdfium.txt
rename to zip/src/main/resources/licenses/3rd-party/pdfium.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/tomcat.txt b/zip/src/main/resources/licenses/3rd-party/tomcat.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/tomcat.txt
rename to zip/src/main/resources/licenses/3rd-party/tomcat.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt b/zip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
rename to zip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/zlib.txt b/zip/src/main/resources/licenses/3rd-party/zlib.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/3rd-party/zlib.txt
rename to zip/src/main/resources/licenses/3rd-party/zlib.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/license.txt b/zip/src/main/resources/licenses/license.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/license.txt
rename to zip/src/main/resources/licenses/license.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/licenses/notice.txt b/zip/src/main/resources/licenses/notice.txt
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/licenses/notice.txt
rename to zip/src/main/resources/licenses/notice.txt
diff --git a/alfresco-platform-community-distributionzip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml b/zip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
similarity index 100%
rename from alfresco-platform-community-distributionzip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
rename to zip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml