diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/action-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/action-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/action-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/audit/rm-audit.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/audit/rm-audit.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/audit/rm-audit.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/audit/rm-audit.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-rejected-email.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-rejected-email.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-rejected-email.ftl
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-rejected-email.ftl
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/recordsCustomModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/recordsCustomModel.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/recordsCustomModel.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/recordsCustomModel.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/rma_isClosed.js b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rma_isClosed.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/content/rma_isClosed.js
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rma_isClosed.js
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml
similarity index 96%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml
index a579ca9961..89139b93b2 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml
@@ -59,14 +59,14 @@
       <property name="name" value="AuditAdmin"/>
       <property name="private" value="true"/>
       <property name="capabilities">
-         <list>
+         <set>
             <ref bean="rmAccessAuditCapability"/>
             <ref bean="rmDeclareAuditAsRecordCapability"/>
             <ref bean="rmDeleteAuditCapability"/>
             <ref bean="rmEnableDisableAuditByTypesCapability"/>
             <ref bean="rmExportAuditCapability"/>
             <ref bean="rmSelectAuditMetadataCapability"/>
-         </list>
+         </set>
       </property>
    </bean>
 
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
similarity index 96%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
index 7bd40ea259..1cf4201a4e 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
@@ -84,10 +84,10 @@
         <property name="name" value="ListAdmin"/>
         <property name="private" value="true"/>
         <property name="capabilities">
-            <list>
+            <set>
                 <ref bean="rmCreateAndAssociateSelectionListsCapability"/>
                 <ref bean="rmEditSelectionListsCapability"/>
-            </list>
+            </set>
         </property>
     </bean>
 
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.acp b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.acp
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.acp
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.acp
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
similarity index 67%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
index 48816440e8..85db9e087f 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
@@ -12,7 +12,7 @@
         </property>
 	    <property name="labels">
 	            <list>
-	                <value>alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model</value>
+	                <value>alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model</value>
 	           </list>
 	    </property>        
     </bean>
@@ -21,12 +21,22 @@
    <bean id="org_alfresco_module_rm_resourceBundles.dod5015" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
-            <value>alfresco.module.org_alfresco_module_rm.dod5015.dod5015</value>
+            <value>alfresco.module.org_alfresco_module_rm.dod5015.messages.dod5015</value>
          </list>
       </property>
    </bean>
    
+   <!--  add publication date as a disposition property -->
+   <bean id="disposition.properties.publicationdate" parent="disposition.properties.base">
+	  <property name="name" value="dod:publicationDate" />
+	  <property name="appliesToFolderLevel" value="false"/>
+   </bean>
+   
    <!--  Include classification capabilities, deprecated for now -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml"/>
-
+   
+   <!--  Model behaviour -->
+   <bean id="dod.dod5015RecordAspect" class="org.alfresco.module.org_alfresco_module_rm.dod5015.model.dod.aspect.DOD5015RecordAspect" parent="rm.baseBehaviour">
+   </bean>
+   
 </beans>
\ No newline at end of file
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml
similarity index 78%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml
index c96a58b304..85bf755290 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015Model.xml
@@ -26,6 +26,7 @@
       <namespace uri="http://www.alfresco.org/model/dod5015/1.0" prefix="dod"/>
    </namespaces>
    
+   <!--  TODO I18N -->
    <constraints>
       <constraint name="dod:imageFormatList" type="LIST">
          <title>Image Formats</title>
@@ -56,6 +57,100 @@
    </types>
    
    <aspects>
+   
+   	  <!--  DOD5015 Record Properties -->
+      <!--  @since 2.2 -->
+      <aspect name="dod:dod5015record">
+        
+        <title>DOD5015 Record</title>
+        <parent>rma:recordMetaData</parent>
+        
+        <properties>
+
+            <property name="dod:publicationDate">
+               <title>Publication Date</title>
+               <type>d:date</type>
+               <mandatory>true</mandatory>
+            </property>
+
+            <property name="dod:originator">
+               <title>Originator</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+
+            <property name="dod:originatingOrganization">
+               <title>Originating Organization</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+
+            <property name="dod:mediaType">
+               <title>Media Type</title>
+               <type>d:text</type>
+               <mandatory>false</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+
+            <property name="dod:format">
+               <title>Format</title>
+               <type>d:text</type>
+               <mandatory>false</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+
+            <property name="dod:dateReceived">
+               <title>Date Received</title>
+               <type>d:date</type>
+               <mandatory>false</mandatory>
+            </property>
+
+            <!-- TODO
+                 Do we need to model this as broken up address?
+                 Should we have a separate property for other address or just a multivalue property?
+            -->
+            <property name="dod:address">
+               <title>Addressee</title>
+               <type>d:text</type>
+               <mandatory>false</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+            <property name="dod:otherAddress">
+               <title>Other Addressee</title>
+               <type>d:text</type>
+               <mandatory>false</mandatory>
+               <index enabled="true">
+		          <atomic>true</atomic>
+		          <stored>false</stored>
+		          <tokenised>false</tokenised>
+		       </index>
+            </property>
+
+         </properties>
+      
+      </aspect>
      
       <aspect name="dod:scannedRecord">
         <title>Scanned Record</title>
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model.properties
similarity index 78%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model.properties
index d5ebc66db5..72b68b6a6c 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model.properties
@@ -2,6 +2,25 @@ dod_dod5015.description=DOD5015 Content Model
           
 dod_dod5015.type.dod_recordSeries.title=Record Series (Deprecated)
 dod_dod5015.type.dod_recordSeries.description=Record Series (Deprecated)
+
+dod_dod5015.aspect.dod_dod5015record.title=DOD5015 Record
+dod_dod5015.aspect.dod_dod5015record.description=DOD5015 Record 
+dod_dod5015.property.rma_publicationDate.title=Publication Date
+dod_dod5015.property.rma_publicationDate.decription=Publication Date
+dod_dod5015.property.rma_originator.title=Originator
+dod_dod5015.property.rma_originator.decription=Originator
+dod_dod5015.property.rma_originatingOrganization.title=Originating Organization
+dod_dod5015.property.rma_originatingOrganization.decription=Originating Organization
+dod_dod5015.property.rma_mediaType.title=Media Type
+dod_dod5015.property.rma_mediaType.decription=Media Type
+dod_dod5015.property.rma_format.title=Format
+dod_dod5015.property.rma_format.decription=Format
+dod_dod5015.property.rma_dateReceived.title=Date Received
+dod_dod5015.property.rma_dateReceived.decription=Date Received
+dod_dod5015.property.rma_address.title=Addressee
+dod_dod5015.property.rma_address.decription=Addressee
+dod_dod5015.property.rma_otherAddress.title=Other Addressee
+dod_dod5015.property.rma_otherAddress.decription=Other Addressee
          
 dod_dod5015.aspect.dod_scannedRecord.title=Scanned Record
 dod_dod5015.aspect.dod_scannedRecord.description=Scanned Record        
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-model_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/dod5015/dod5015_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/log4j.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/log4j.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model.properties
similarity index 92%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model.properties
index c4a8f6abc7..71dcabdf8e 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model.properties
@@ -160,22 +160,6 @@ rma_recordsmanagement.aspect.rma_record.title=Record
 rma_recordsmanagement.aspect.rma_record.decription=Record
 rma_recordsmanagement.property.rma_dateFiled.title=Date Filed
 rma_recordsmanagement.property.rma_dateFiled.decription=Date Filed
-rma_recordsmanagement.property.rma_publicationDate.title=Publication Date
-rma_recordsmanagement.property.rma_publicationDate.decription=Publication Date
-rma_recordsmanagement.property.rma_originator.title=Originator
-rma_recordsmanagement.property.rma_originator.decription=Originator
-rma_recordsmanagement.property.rma_originatingOrganization.title=Originating Organization
-rma_recordsmanagement.property.rma_originatingOrganization.decription=Originating Organization
-rma_recordsmanagement.property.rma_mediaType.title=Media Type
-rma_recordsmanagement.property.rma_mediaType.decription=Media Type
-rma_recordsmanagement.property.rma_format.title=Format
-rma_recordsmanagement.property.rma_format.decription=Format
-rma_recordsmanagement.property.rma_dateReceived.title=Date Received
-rma_recordsmanagement.property.rma_dateReceived.decription=Date Received
-rma_recordsmanagement.property.rma_address.title=Addressee
-rma_recordsmanagement.property.rma_address.decription=Addressee
-rma_recordsmanagement.property.rma_otherAddress.title=Other Addressee
-rma_recordsmanagement.property.rma_otherAddress.decription=Other Addressee
 rma_recordsmanagement.property.rma_origionalName=Original Name
 
 rma_recordsmanagement.aspect.rma_recordMetaData.title=Record Meta-data
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/report-service_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/report-service_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-actions_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-events_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_fr.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_it.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_it.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/template.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/messages/template.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
similarity index 90%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index f1506022ac..21c6b126e4 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -610,6 +610,7 @@
        	</properties>
       </aspect>
 
+      <!-- @deprecated as of 2.1 -->
       <aspect name="rma:recordsManagementRoot">
         <title>Records Management Root</title>
          <associations>
@@ -732,88 +733,7 @@
                <title>Original Name</title>
                <type>d:text</type>
                <protected>true</protected>
-            </property>
-
-            <property name="rma:publicationDate">
-               <title>Publication Date</title>
-               <type>d:date</type>
-               <mandatory>true</mandatory>
-            </property>
-
-            <property name="rma:originator">
-               <title>Originator</title>
-               <type>d:text</type>
-               <mandatory>true</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
-
-            <property name="rma:originatingOrganization">
-               <title>Originating Organization</title>
-               <type>d:text</type>
-               <mandatory>true</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
-
-            <property name="rma:mediaType">
-               <title>Media Type</title>
-               <type>d:text</type>
-               <mandatory>false</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
-
-            <property name="rma:format">
-               <title>Format</title>
-               <type>d:text</type>
-               <mandatory>false</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
-
-            <property name="rma:dateReceived">
-               <title>Date Received</title>
-               <type>d:date</type>
-               <mandatory>false</mandatory>
-            </property>
-
-            <!-- TODO
-                 Do we need to model this as broken up address?
-                 Should we have a separate property for other address or just a multivalue property?
-            -->
-            <property name="rma:address">
-               <title>Addressee</title>
-               <type>d:text</type>
-               <mandatory>false</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
-            <property name="rma:otherAddress">
-               <title>Other Addressee</title>
-               <type>d:text</type>
-               <mandatory>false</mandatory>
-               <index enabled="true">
-		          <atomic>true</atomic>
-		          <stored>false</stored>
-		          <tokenised>false</tokenised>
-		       </index>
-            </property>
+            </property>            
 
          </properties>
 
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/reportModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/reportModel.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/reportModel.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/model/reportModel.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/rm-model-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/rm-model-security-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/model/rm-model-security-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/model/rm-model-security-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/module-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/module.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMapConfig.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMapConfig.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMapConfig.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMapConfig.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
similarity index 96%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index 349e7f3eb9..29b354716e 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -25,7 +25,7 @@
    <bean id="compositeCapability"
       abstract="true"
       parent="rmBaseCapability"
-      class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability" />
+      class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCompositeCapability" />
 
    <bean id="rmCycleVitalRecordsCapability"
       parent="declarativeCapability">
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-deprecated-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-deprecated-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-deprecated-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-deprecated-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml
similarity index 82%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml
index c16bd5567d..b83ba6243b 100644
--- a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-disposition-properties-context.xml
@@ -33,14 +33,8 @@
 	   <property name="appliesToFolderLevel" value="false"/>
 	</bean>
 	
-	<bean id="disposition.properties.publicationdate" parent="disposition.properties.base">
-	   <property name="name" value="rma:publicationDate" />
-	   <property name="appliesToFolderLevel" value="false"/>
-	</bean>
-	
 	<bean id="disposition.properties.created" parent="disposition.properties.base">
 	   <property name="name" value="cm:created" />
-	   <property name="appliesToRecordLevel" value="false"/>
 	</bean>
 	    
 </beans>
\ No newline at end of file
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-id-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-id-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-id-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-id-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-job-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-report-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-method-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security-context.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-method-security-context.xml
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security-context.xml
diff --git a/rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
rename to rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint-utils.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint-utils.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint-utils.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint-utils.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_de.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_de.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_de.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_es.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_es.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_es.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_fr.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_fr.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_it.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_it.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_it.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_ja.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_ja.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_de.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_de.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_de.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_es.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_es.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_es.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_fr.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_fr.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_it.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_it.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_it.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_ja.properties b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_ja.properties
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevents.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customref.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customref.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionschedule.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dodcustomtypes.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/export.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/export.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/export.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/export.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/export.post.html.status.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/export.post.html.status.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/export.post.html.status.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/export.post.html.status.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.html.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.html.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.html.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.html.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/import.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/import.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/listofvalues.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/recordmetadataaspects.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmaction.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.lib.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.lib.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.lib.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlog.put.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmauditlogstatus.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmconstraints.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transfer.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transfer.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transfer.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transfer.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transferreport.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transferreport.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transferreport.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transferreport.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transferreport.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transferreport.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/transferreport.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/transferreport.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/userrightsreport.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-node.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-parse-args.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-parse-args.lib.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-parse-args.lib.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-parse-args.lib.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/forms/metadata.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearch.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.desc.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.desc.xml
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.desc.xml
diff --git a/rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
similarity index 100%
rename from rm-server/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
diff --git a/rm-server/src/main/resources/alfresco/workflow/requestInfo.bpmn20.xml b/rm-server/config/alfresco/workflow/requestInfo.bpmn20.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/requestInfo.bpmn20.xml
rename to rm-server/config/alfresco/workflow/requestInfo.bpmn20.xml
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_de.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages_de.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_de.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages_de.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_es.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages_es.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_es.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages_es.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_fr.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages_fr.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_fr.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages_fr.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_it.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages_it.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_it.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages_it.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_ja.properties b/rm-server/config/alfresco/workflow/rm-workflow-messages_ja.properties
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rm-workflow-messages_ja.properties
rename to rm-server/config/alfresco/workflow/rm-workflow-messages_ja.properties
diff --git a/rm-server/src/main/resources/alfresco/workflow/rmWorkflowModel.xml b/rm-server/config/alfresco/workflow/rmWorkflowModel.xml
similarity index 100%
rename from rm-server/src/main/resources/alfresco/workflow/rmWorkflowModel.xml
rename to rm-server/config/alfresco/workflow/rmWorkflowModel.xml
diff --git a/rm-server/config/readme.txt b/rm-server/config/readme.txt
new file mode 100644
index 0000000000..4659be670f
--- /dev/null
+++ b/rm-server/config/readme.txt
@@ -0,0 +1 @@
+Files in this directory will be added to the amp.
\ No newline at end of file
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 6157ae2d7e..6b2bd6adc5 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -14,6 +14,18 @@
       <webapp.id>alfresco</webapp.id>
    </properties>
    <build>
+      <sourceDirectory>source/java</sourceDirectory>
+      <testSourceDirectory>test/java</testSourceDirectory>
+      <resources>
+         <resource>
+            <directory>config</directory>
+         </resource>
+      </resources>
+      <testResources>
+         <testResource>
+            <directory>test/resources</directory>
+         </testResource>
+      </testResources>
       <plugins>
          <plugin>
             <groupId>org.alfresco.maven.plugin</groupId>
@@ -38,7 +50,7 @@
                    </goals>
                    <configuration>
                        <sources>
-                          <source>src/main/compatibility</source>
+                          <source>source/compatibility</source>
                        </sources>
                    </configuration>
                </execution>
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java
similarity index 97%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java
index 163c50e5d6..5550b8f4ae 100644
--- a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java
+++ b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm;
-
-import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.I18NUtil;
-
-/**
- * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CannotApplyConstraintMetadataException}
- */
-public class CannotApplyConstraintMetadataException extends CustomMetadataException
-{
-    private static final long serialVersionUID = -6194867814140009959L;
-    public static final String MSG_CANNOT_APPLY_CONSTRAINT = "rm.admin.cannot-apply-constraint";
-    
-    public CannotApplyConstraintMetadataException(QName lovConstraint, String propIdAsString, QName dataType)
-    {
-        super(I18NUtil.getMessage(CannotApplyConstraintMetadataException.MSG_CANNOT_APPLY_CONSTRAINT, lovConstraint, propIdAsString, dataType));
-    }
-}
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CannotApplyConstraintMetadataException}
+ */
+public class CannotApplyConstraintMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_CANNOT_APPLY_CONSTRAINT = "rm.admin.cannot-apply-constraint";
+    
+    public CannotApplyConstraintMetadataException(QName lovConstraint, String propIdAsString, QName dataType)
+    {
+        super(I18NUtil.getMessage(CannotApplyConstraintMetadataException.MSG_CANNOT_APPLY_CONSTRAINT, lovConstraint, propIdAsString, dataType));
+    }
+}
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java
similarity index 97%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java
index 6b360ef97a..ac98c5467c 100644
--- a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java
+++ b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm;
-
-/**
- * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException}
- */
-public abstract class CustomMetadataException extends Exception
-{
-    private static final long serialVersionUID = -6676112294794381360L;
-    
-    public CustomMetadataException(String msg)
-    {
-        super(msg);
-    }
-}
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm;
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException}
+ */
+public abstract class CustomMetadataException extends Exception
+{
+    private static final long serialVersionUID = -6676112294794381360L;
+    
+    public CustomMetadataException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java
similarity index 97%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java
index 6ffe9b7bbd..f468610476 100644
--- a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java
+++ b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm;
-
-import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.I18NUtil;
-
-/**
- * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.InvalidCustomAspectMetadataException}
- */
-public class InvalidCustomAspectMetadataException extends CustomMetadataException
-{
-    private static final long serialVersionUID = -6194867814140009959L;
-    public static final String MSG_INVALID_CUSTOM_ASPECT = "rm.admin.invalid-custom-aspect";
-    
-    public InvalidCustomAspectMetadataException(QName customAspect, String aspectName)
-    {
-        super(I18NUtil.getMessage(MSG_INVALID_CUSTOM_ASPECT, customAspect, aspectName));
-    }
-}
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.InvalidCustomAspectMetadataException}
+ */
+public class InvalidCustomAspectMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_INVALID_CUSTOM_ASPECT = "rm.admin.invalid-custom-aspect";
+    
+    public InvalidCustomAspectMetadataException(QName customAspect, String aspectName)
+    {
+        super(I18NUtil.getMessage(MSG_INVALID_CUSTOM_ASPECT, customAspect, aspectName));
+    }
+}
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java
similarity index 97%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java
index dff3eb4e7e..75e35e4fce 100644
--- a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java
+++ b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm;
-
-import org.springframework.extensions.surf.util.I18NUtil;
-
-/**
- * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.NotCustomisableMetadataException}
- */
-public class NotCustomisableMetadataException extends CustomMetadataException
-{
-    private static final long serialVersionUID = -6194867814140009959L;
-    public static final String MSG_NOT_CUSTOMISABLE = "rm.admin.not-customisable";
-    
-    public NotCustomisableMetadataException(String aspectName)
-    {
-        super(I18NUtil.getMessage(MSG_NOT_CUSTOMISABLE, aspectName));
-    }
-}
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm;
+
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.NotCustomisableMetadataException}
+ */
+public class NotCustomisableMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_NOT_CUSTOMISABLE = "rm.admin.not-customisable";
+    
+    public NotCustomisableMetadataException(String aspectName)
+    {
+        super(I18NUtil.getMessage(MSG_NOT_CUSTOMISABLE, aspectName));
+    }
+}
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java
similarity index 97%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java
index e902e2cc0a..292b8029a4 100644
--- a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java
+++ b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm;
-
-import org.springframework.extensions.surf.util.I18NUtil;
-
-/**
- * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.PropertyAlreadyExistsMetadataException}
- */
-public class PropertyAlreadyExistsMetadataException extends CustomMetadataException
-{
-    private static final long serialVersionUID = -6194867814140009959L;
-
-    public static final String MSG_PROPERTY_ALREADY_EXISTS = "rm.admin.property-already-exists";
-    
-    public PropertyAlreadyExistsMetadataException(String propIdAsString)
-    {
-        super(I18NUtil.getMessage(MSG_PROPERTY_ALREADY_EXISTS, propIdAsString));
-    }
-}
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm;
+
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.PropertyAlreadyExistsMetadataException}
+ */
+public class PropertyAlreadyExistsMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+
+    public static final String MSG_PROPERTY_ALREADY_EXISTS = "rm.admin.property-already-exists";
+    
+    public PropertyAlreadyExistsMetadataException(String propIdAsString)
+    {
+        super(I18NUtil.getMessage(MSG_PROPERTY_ALREADY_EXISTS, propIdAsString));
+    }
+}
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceDeprecated.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceDeprecated.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceDeprecated.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceDeprecated.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
diff --git a/rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java b/rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java
similarity index 100%
rename from rm-server/src/main/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java
rename to rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementPolicies.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementPolicies.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementPolicies.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementPolicies.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/PropertySubActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/PropertySubActionExecuterAbstractBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/PropertySubActionExecuterAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/PropertySubActionExecuterAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinitionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinitionImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinitionImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinitionImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinitionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinitionImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinitionImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinitionImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionResult.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionResult.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionResult.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionResult.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/ExecuteScriptAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/ExecuteScriptAction.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/ExecuteScriptAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/ExecuteScriptAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/CapabilityConditionEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/CapabilityConditionEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/CapabilityConditionEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/CapabilityConditionEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DelegateActionCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DelegateActionCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DelegateActionCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DelegateActionCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/HasDispositionActionEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/HasDispositionActionEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/HasDispositionActionEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/HasDispositionActionEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsRecordTypeEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsRecordTypeEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsRecordTypeEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsRecordTypeEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CreateDispositionScheduleAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CreateDispositionScheduleAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CreateDispositionScheduleAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CreateDispositionScheduleAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditHoldReasonAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditHoldReasonAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditHoldReasonAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditHoldReasonAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditReviewAsOfDateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditReviewAsOfDateAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditReviewAsOfDateAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditReviewAsOfDateAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RelinquishHoldAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RelinquishHoldAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RelinquishHoldAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RelinquishHoldAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnfreezeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnfreezeAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnfreezeAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnfreezeAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/CannotApplyConstraintMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CannotApplyConstraintMetadataException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/CannotApplyConstraintMetadataException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CannotApplyConstraintMetadataException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/CustomMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CustomMetadataException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/CustomMetadataException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CustomMetadataException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/InvalidCustomAspectMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/InvalidCustomAspectMetadataException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/InvalidCustomAspectMetadataException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/InvalidCustomAspectMetadataException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/NotCustomisableMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/NotCustomisableMetadataException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/NotCustomisableMetadataException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/NotCustomisableMetadataException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/PropertyAlreadyExistsMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/PropertyAlreadyExistsMetadataException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/PropertyAlreadyExistsMetadataException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/PropertyAlreadyExistsMetadataException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreateObjectAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreateObjectAuditEvent.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreateObjectAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreateObjectAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreatePersonAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreatePersonAuditEvent.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreatePersonAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreatePersonAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteObjectAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteObjectAuditEvent.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteObjectAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteObjectAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
similarity index 94%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
index c13301c2cf..cd755f1075 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java
similarity index 95%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java
index 75eb3cb64b..2f6f9af7bb 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CompositeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CompositeCapability.java
new file mode 100644
index 0000000000..569c48c12a
--- /dev/null
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CompositeCapability.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.capability;
+
+import java.util.Set;
+
+/**
+ * Composite capability Interface.
+ *
+ * @author Roy Wetherall
+ * @since 2.2
+ */
+public interface CompositeCapability extends Capability
+{
+    /**
+     * Get set of child capabilities.
+     * 
+     * @return  {@link Set}<{@link Capability}> set of child capabilities.
+     */
+    Set<Capability> getCapabilities();
+}
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/PolicyRegister.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/PolicyRegister.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/PolicyRegister.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/PolicyRegister.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMActionProxyFactoryBean.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java
similarity index 83%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java
index eacdc6d369..081f0200fc 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -18,11 +18,12 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
 
-import java.util.List;
+import java.util.Set;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
+import org.alfresco.module.org_alfresco_module_rm.capability.CompositeCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
@@ -30,19 +31,29 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * 
  * @author Roy Wetherall
  */
-public class CompositeCapability extends DeclarativeCapability
+public class DeclarativeCompositeCapability extends DeclarativeCapability 
+                                            implements CompositeCapability
 {
-    /** List of capabilities */
-    private List<Capability> capabilities;
+    /** set of capabilities */
+    private Set<Capability> capabilities;
     
     /**
-     * @param capabilites   list of capabilities
+     * @param capabilites   set of capabilities
      */
-    public void setCapabilities(List<Capability> capabilities)
+    public void setCapabilities(Set<Capability> capabilities)
     {
         this.capabilities = capabilities;
     }
     
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.CompositeCapability#getCapabilities()
+     */
+    @Override
+    public Set<Capability> getCapabilities()
+    {
+        return this.capabilities;
+    }
+    
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability#evaluateImpl(org.alfresco.service.cmr.repository.NodeRef)
      */
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ChangeOrDeleteReferencesCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ChangeOrDeleteReferencesCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ChangeOrDeleteReferencesCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ChangeOrDeleteReferencesCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/DeleteLinksCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/DeleteLinksCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/DeleteLinksCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/DeleteLinksCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java
similarity index 91%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java
index 37f5bd0059..35c7348be6 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdateCapability.java
@@ -21,7 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.capability.impl;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability;
+import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCompositeCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 
@@ -30,7 +30,7 @@ import org.alfresco.service.namespace.QName;
  * 
  * @author andyh
  */
-public class UpdateCapability extends CompositeCapability
+public class UpdateCapability extends DeclarativeCompositeCapability
 {
     /**
      * 
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
similarity index 90%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
index d17a2171cf..c485091639 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/UpdatePropertiesCapability.java
@@ -21,7 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.capability.impl;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability;
+import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCompositeCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 
@@ -30,7 +30,7 @@ import org.alfresco.service.namespace.QName;
  * 
  * @author andyh
  */
-public class UpdatePropertiesCapability extends CompositeCapability
+public class UpdatePropertiesCapability extends DeclarativeCompositeCapability
 {
    /**
      * Evaluate capability, taking into account the protected properties.
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ViewRecordsCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ViewRecordsCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ViewRecordsCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ViewRecordsCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSchedule.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSchedule.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSchedule.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSchedule.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java
similarity index 85%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java
index 1562e72f96..454ead7431 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java
@@ -32,7 +32,16 @@ public interface DOD5015Model
 	public static final String DOD_URI = "http://www.alfresco.org/model/dod5015/1.0";
 	public static final String DOD_PREFIX = "dod";
 	
-    // DOD 5015 Custom Type aspects and their properties
+    // DOD Record
+	
+	public static final QName ASPECT_DOD_5015_RECORD = QName.createQName(DOD_URI, "dod5015record");
+	public static final QName PROP_ORIGINATOR = QName.createQName(DOD_URI, "originator");
+	public static final QName PROP_ORIGINATING_ORGANIZATION = QName.createQName(DOD_URI, "originatingOrganization");
+	public static final QName PROP_PUBLICATION_DATE = QName.createQName(DOD_URI, "publicationDate");
+	public static final QName PROP_MEDIA_TYPE = QName.createQName(DOD_URI, "mediaType");
+	public static final QName PROP_FORMAT = QName.createQName(DOD_URI, "format");
+	public static final QName PROP_DATE_RECEIVED = QName.createQName(DOD_URI, "dateReceived");
+		
     // Scanned Record
     public static final QName ASPECT_SCANNED_RECORD = QName.createQName(DOD_URI, "scannedRecord");
     public static final QName PROP_SCANNED_FORMAT = QName.createQName(DOD_URI, "scannedFormat");
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java
new file mode 100644
index 0000000000..9cc6235fbf
--- /dev/null
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.dod5015.model.dod.aspect;
+
+import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
+import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
+import org.alfresco.repo.node.NodeServicePolicies;
+import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
+import org.alfresco.repo.policy.annotation.Behaviour;
+import org.alfresco.repo.policy.annotation.BehaviourBean;
+import org.alfresco.repo.policy.annotation.BehaviourKind;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * dod:dod5015record behaviour bean
+ * 
+ * @author Roy Wetherall
+ * @since 2.2
+ */
+@BehaviourBean
+public class DOD5015RecordAspect extends    BaseBehaviourBean
+                                 implements NodeServicePolicies.OnAddAspectPolicy,
+                                            DOD5015Model
+{
+    /**
+     * Ensure that the DOD record aspect meta-data is applied.
+     * 
+     * @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
+     */
+    @Behaviour
+    (
+            kind=BehaviourKind.CLASS,
+            type="rma:record",
+            notificationFrequency = NotificationFrequency.FIRST_EVENT
+    )
+    @Override
+    public void onAddAspect(NodeRef nodeRef, QName aspect)
+    {
+        if (nodeService.exists(nodeRef) == true && 
+            nodeService.hasAspect(nodeRef, ASPECT_DOD_5015_RECORD) == false)
+        {
+            nodeService.addAspect(nodeRef, ASPECT_DOD_5015_RECORD, null);
+        }
+    }
+   
+}
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomMapping.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomMapping.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomMapping.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomMapping.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomisableEmailMappingKeyBootstrap.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomisableEmailMappingKeyBootstrap.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/CustomisableEmailMappingKeyBootstrap.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomisableEmailMappingKeyBootstrap.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/EventCompletionDetails.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/EventCompletionDetails.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/EventCompletionDetails.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/EventCompletionDetails.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEvent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEvent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/SimpleRecordsManagementEventTypeImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/SimpleRecordsManagementEventTypeImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/event/SimpleRecordsManagementEventTypeImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/SimpleRecordsManagementEventTypeImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java
similarity index 94%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java
index 733da7320d..99d285277b 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java
@@ -124,7 +124,7 @@ public abstract class RecordsManagementFormFilter<ItemType> extends AbstractFilt
      * @param props
      * @param setId
      */
-    protected void addPropertyFieldsToGroup(Form form, Map<QName, PropertyDefinition> props, String setId)
+    protected void addPropertyFieldsToGroup(Form form, Map<QName, PropertyDefinition> props, String setId, String setLabel)
     {
         if (props != null)
         {
@@ -137,7 +137,7 @@ public abstract class RecordsManagementFormFilter<ItemType> extends AbstractFilt
                 NodeRef nodeRef = new NodeRef(id);
                 Serializable value = nodeService.getProperty(nodeRef, entry.getKey());
 
-                FieldGroup group = new FieldGroup(setId, null, false, false, null);
+                FieldGroup group = new FieldGroup(setId, setLabel, false, false, null);
                 Field field = FieldUtils.makePropertyField(prop, value, group, namespaceService, dictionaryService);
 
                 form.addField(field);
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
similarity index 93%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
index 21ad07f4ca..d0b740615f 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
@@ -39,7 +39,9 @@ import org.alfresco.repo.forms.Form;
 import org.alfresco.repo.forms.PropertyFieldDefinition;
 import org.alfresco.repo.forms.processor.node.FieldUtils;
 import org.alfresco.repo.forms.processor.node.FormFieldConstants;
+import org.alfresco.repo.i18n.StaticMessageLookup;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -169,7 +171,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
 
         for (QName customisable : customisables)
         {
-            addPropertyFieldsToGroup(form, rmAdminService.getCustomPropertyDefinitions(customisable), CUSTOM_RM_FIELD_GROUP_ID);
+            addPropertyFieldsToGroup(form, rmAdminService.getCustomPropertyDefinitions(customisable), CUSTOM_RM_FIELD_GROUP_ID, null);
         }
     }
 
@@ -188,7 +190,15 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
             {
                 String aspectName = aspect.getPrefixedQName(namespaceService).toPrefixString().replace(":", "-");
                 String setId = RM_METADATA_PREFIX + aspectName;
-                addPropertyFieldsToGroup(form, dictionaryService.getPropertyDefs(aspect), setId);
+                                
+                String setLabel = null;
+                AspectDefinition aspectDefinition = dictionaryService.getAspect(aspect);
+                if (aspectDefinition != null)
+                {
+                    setLabel = aspectDefinition.getTitle(new StaticMessageLookup());
+                }
+                
+                addPropertyFieldsToGroup(form, dictionaryService.getPropertyDefs(aspect), setId, setLabel);
             }
         }
     }
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/BasicIdentifierGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/BasicIdentifierGenerator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/BasicIdentifierGenerator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/BasicIdentifierGenerator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGenerator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGenerator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGenerator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGeneratorBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGeneratorBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGeneratorBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierGeneratorBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/BasePublishExecutor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/BasePublishExecutor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/BasePublishExecutor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/BasePublishExecutor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptCapability.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptCapability.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptCapability.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/CutoffEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/CutoffEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/CutoffEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/CutoffEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FolderOpenClosedEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FolderOpenClosedEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FolderOpenClosedEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FolderOpenClosedEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FrozenEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FrozenEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FrozenEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/FrozenEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/HasAspectEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/HasAspectEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/HasAspectEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/HasAspectEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/NonElectronicEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/NonElectronicEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/NonElectronicEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/NonElectronicEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TrueEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TrueEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TrueEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TrueEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/VitalRecordEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/VitalRecordEvaluator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/VitalRecordEvaluator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/VitalRecordEvaluator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/CustomisableTypesBootstrap.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/CustomisableTypesBootstrap.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/CustomisableTypesBootstrap.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/CustomisableTypesBootstrap.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementCustomModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementCustomModel.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementCustomModel.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementCustomModel.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
similarity index 94%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
index b6e560e244..44e39bea27 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
@@ -100,12 +100,12 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
     public static final QName ASPECT_RECORD = QName.createQName(RM_URI, "record");
     public static final QName PROP_DATE_FILED = QName.createQName(RM_URI, "dateFiled");
     public static final QName PROP_ORIGIONAL_NAME = QName.createQName(RM_URI, "origionalName");
-    public static final QName PROP_ORIGINATOR = QName.createQName(RM_URI, "originator");
-    public static final QName PROP_ORIGINATING_ORGANIZATION = QName.createQName(RM_URI, "originatingOrganization");
-    public static final QName PROP_PUBLICATION_DATE = QName.createQName(RM_URI, "publicationDate");
-    public static final QName PROP_MEDIA_TYPE = QName.createQName(RM_URI, "mediaType");
-    public static final QName PROP_FORMAT = QName.createQName(RM_URI, "format");
-    public static final QName PROP_DATE_RECEIVED = QName.createQName(RM_URI, "dateReceived");
+  //  public static final QName PROP_ORIGINATOR = QName.createQName(RM_URI, "originator");
+  //  public static final QName PROP_ORIGINATING_ORGANIZATION = QName.createQName(RM_URI, "originatingOrganization");
+  //  public static final QName PROP_PUBLICATION_DATE = QName.createQName(RM_URI, "publicationDate");
+  //  public static final QName PROP_MEDIA_TYPE = QName.createQName(RM_URI, "mediaType");
+  //  public static final QName PROP_FORMAT = QName.createQName(RM_URI, "format");
+  //  public static final QName PROP_DATE_RECEIVED = QName.createQName(RM_URI, "dateReceived");
 
     // Common record details
     public static final QName PROP_LOCATION = QName.createQName(RM_URI, "location");
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ExtendedSecurityAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ExtendedSecurityAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ExtendedSecurityAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ExtendedSecurityAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java
similarity index 71%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java
index cc7aa4bbb2..977f95ee44 100644
--- a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/GhostedAspect.java
@@ -21,6 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.model.rma.aspect;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
 import org.alfresco.repo.content.ContentServicePolicies;
+import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
 import org.alfresco.repo.policy.annotation.Behaviour;
 import org.alfresco.repo.policy.annotation.BehaviourBean;
 import org.alfresco.repo.policy.annotation.BehaviourKind;
@@ -33,9 +34,9 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * @author Roy Wetherall
  * @since 2.2
  */
-@BehaviourBean
+@BehaviourBean 
 (
-   defaultType = "rma:ghosted"
+   defaultType = "rma:ghosted" // optional
 )
 public class GhostedAspect extends    BaseBehaviourBean
                            implements ContentServicePolicies.OnContentUpdatePolicy
@@ -47,11 +48,18 @@ public class GhostedAspect extends    BaseBehaviourBean
      * Ensure that the content of a ghosted node can not be updated.
      * 
      * @see org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy#onContentUpdate(org.alfresco.service.cmr.repository.NodeRef, boolean)
-     */
+     */ 
     @Override
     @Behaviour
     (
-       kind = BehaviourKind.CLASS
+       kind = BehaviourKind.CLASS,                                // required, use ASSOC for association behaviors
+       notificationFrequency = NotificationFrequency.EVERY_EVENT, // (defaults to EVERY_EVENT)
+       policy = "alf:onContentUpdate",                            // (defaults to alf:<methodname>)
+       type = "rma:ghosted"                                       // required, unless defaultType set
+       
+       // isService (default false)
+       // name (only needs to specified if associated behvaiour object needs to be accessed)
+       // assocType (defaults to cm:contains, used with BehaviourKind.ASSOC)
     )
     public void onContentUpdate(NodeRef Content, boolean bNew)
     {
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordSearchAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordSearchAspect.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordSearchAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordSearchAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ScheduledAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ScheduledAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ScheduledAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/ScheduledAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordAspect.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordDefinitionAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordDefinitionAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordDefinitionAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VitalRecordDefinitionAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelAccessDeniedException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelAccessDeniedException.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelAccessDeniedException.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelAccessDeniedException.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedAspect.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedAspect.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedAspect.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedProperty.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedProperty.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedProperty.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedProperty.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch_v21.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch_v21.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch_v21.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch_v21.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22ReportTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22ReportTemplatePatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22ReportTemplatePatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22ReportTemplatePatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAO.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAO.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAO.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAO.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/Report.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/Report.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/Report.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/Report.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportGenerator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportGenerator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportGenerator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportModel.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportModel.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportModel.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/BaseReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/BaseReportAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/BaseReportAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/BaseReportAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/DestructionReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/DestructionReportAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/DestructionReportAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/DestructionReportAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferNode.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/TransferReportAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/BaseReportGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/BaseReportGenerator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/BaseReportGenerator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/BaseReportGenerator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/Role.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/Role.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/role/Role.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/Role.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditRetrievalWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditRetrievalWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditRetrievalWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditRetrievalWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseCustomPropertyWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseCustomPropertyWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseCustomPropertyWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseCustomPropertyWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceType.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceType.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceType.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionScheduleGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionScheduleGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionScheduleGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionScheduleGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ExportPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ExportPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ExportPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ExportPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RMEventBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RMEventBase.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RMEventBase.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RMEventBase.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/ReportDetails.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/ReportDetails.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/ReportDetails.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/ReportDetails.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SortItem.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SortItem.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/search/SortItem.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SortItem.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedReaderDynamicAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanAuthenticationServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/site/GetChildrenCannedQueryFactory.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/site/GetChildrenCannedQueryFactory.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/site/GetChildrenCannedQueryFactory.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/site/GetChildrenCannedQueryFactory.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/ReviewedAction.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinition.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinition.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinition.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinitionImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinitionImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinitionImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinitionImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordService.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordService.java
diff --git a/rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
rename to rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
rename to rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java
rename to rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java
rename to rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/parameter/ParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/parameter/ParameterProcessor.java
rename to rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java b/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java
rename to rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/jscript/ExtendedSearch.java b/rm-server/source/java/org/alfresco/repo/jscript/ExtendedSearch.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/jscript/ExtendedSearch.java
rename to rm-server/source/java/org/alfresco/repo/jscript/ExtendedSearch.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
rename to rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/Behaviour.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java
rename to rm-server/source/java/org/alfresco/repo/policy/annotation/Behaviour.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
rename to rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
rename to rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
old mode 100755
new mode 100644
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
rename to rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java b/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
rename to rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/rule/ruletrigger/ExtendedBeforeDeleteChildAssociationRuleTrigger.java b/rm-server/source/java/org/alfresco/repo/rule/ruletrigger/ExtendedBeforeDeleteChildAssociationRuleTrigger.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/rule/ruletrigger/ExtendedBeforeDeleteChildAssociationRuleTrigger.java
rename to rm-server/source/java/org/alfresco/repo/rule/ruletrigger/ExtendedBeforeDeleteChildAssociationRuleTrigger.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/security/authority/RMAuthority.java b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/security/authority/RMAuthority.java
rename to rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java
rename to rm-server/source/java/org/alfresco/repo/security/authority/RMAuthorityDAOImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionService.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionService.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionService.java
rename to rm-server/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionService.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
rename to rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/RMACLEntryVoter.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/acegi/RMACLEntryVoter.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/RMACLEntryVoter.java
rename to rm-server/source/java/org/alfresco/repo/security/permissions/impl/acegi/RMACLEntryVoter.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmDictionaryWebServiceUtils.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmDictionaryWebServiceUtils.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmDictionaryWebServiceUtils.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmDictionaryWebServiceUtils.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/AbstractRmAuthorities.java b/rm-server/source/java/org/alfresco/repo/web/scripts/roles/AbstractRmAuthorities.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/AbstractRmAuthorities.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/roles/AbstractRmAuthorities.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java b/rm-server/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java b/rm-server/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java
rename to rm-server/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java
diff --git a/rm-server/src/main/java/org/alfresco/workflow/RMWorkflowModel.java b/rm-server/source/java/org/alfresco/workflow/RMWorkflowModel.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/workflow/RMWorkflowModel.java
rename to rm-server/source/java/org/alfresco/workflow/RMWorkflowModel.java
diff --git a/rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java
rename to rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java
diff --git a/rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
rename to rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
diff --git a/rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoUtils.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoUtils.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoUtils.java
rename to rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoUtils.java
diff --git a/rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoVariableHandler.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoVariableHandler.java
similarity index 100%
rename from rm-server/src/main/java/org/alfresco/workflow/requestInfo/RequestInfoVariableHandler.java
rename to rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoVariableHandler.java
diff --git a/rm-server/source/resources/readme.txt b/rm-server/source/resources/readme.txt
new file mode 100644
index 0000000000..c3322908fb
--- /dev/null
+++ b/rm-server/source/resources/readme.txt
@@ -0,0 +1 @@
+Files in this directory will be added to the jar.
\ No newline at end of file
diff --git a/rm-server/src/test/resources/testng.xml b/rm-server/src/test/resources/testng.xml
deleted file mode 100644
index 4844e9b8d6..0000000000
--- a/rm-server/src/test/resources/testng.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="JUnit AllTestSuite" verbose="1" >
-   <test name="AllTests" junit="true">
-      <classes>
-         <class name="org.alfresco.module.org_alfresco_module_rm.test.AllTestSuite" />
-      </classes>
-   </test>
-</suite>
\ No newline at end of file
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/IssueTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/IssueTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/IssueTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/IssueTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
similarity index 97%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
index f30c01c21d..e9c069733a 100644
--- a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
@@ -29,7 +29,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition;
-import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability;
+import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCompositeCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanComponentKind;
 import org.alfresco.module.org_alfresco_module_rm.role.Role;
@@ -146,7 +146,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
         for (Capability capability : capabilities)
         {
             if (capability instanceof DeclarativeCapability &&
-                capability instanceof CompositeCapability == false &&
+                capability instanceof DeclarativeCompositeCapability == false &&
                 capability.isPrivate() == false &&
                 capability.getName().equals("MoveRecords") == false &&
                 capability.getName().equals("DeleteLinks") == false &&
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1008Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1008Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1008Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1008Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1027Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1027Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1027Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1027Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1030Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1030Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1030Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1030Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM452Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM452Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM452Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM452Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM804Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM804Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM804Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM804Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM981SystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM981SystemTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM981SystemTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM981SystemTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM994Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM994Test.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM994Test.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM994Test.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java
similarity index 96%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java
index bc27c5b19d..51d18234b4 100644
--- a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java
@@ -34,6 +34,7 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionD
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
 import org.alfresco.module.org_alfresco_module_rm.disposition.property.DispositionProperty;
+import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.module.org_alfresco_module_rm.event.EventCompletionDetails;
 import org.alfresco.module.org_alfresco_module_rm.job.PublishUpdatesJobExecuter;
 import org.alfresco.module.org_alfresco_module_rm.job.publish.PublishExecutor;
@@ -851,7 +852,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
                 adParams.put(PROP_DISPOSITION_ACTION_NAME, "cutoff");
                 adParams.put(PROP_DISPOSITION_DESCRIPTION, "test");
                 adParams.put(PROP_DISPOSITION_PERIOD, "week|1");
-                adParams.put(PROP_DISPOSITION_PERIOD_PROPERTY, PROP_PUBLICATION_DATE.toString());
+                adParams.put(PROP_DISPOSITION_PERIOD_PROPERTY, DOD5015Model.PROP_PUBLICATION_DATE.toString());
 
                 dispositionService.addDispositionActionDefinition(testRM263DispositionSchedule, adParams);
 
@@ -869,7 +870,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
             @Override
             public Void run() throws Exception
             {
-                Date pubDate = (Date)nodeService.getProperty(testRM263Record, PROP_PUBLICATION_DATE);
+                Date pubDate = (Date)nodeService.getProperty(testRM263Record, DOD5015Model.PROP_PUBLICATION_DATE);
                 assertNull(pubDate);
                 Date asOfDate = (Date)nodeService.getProperty(testRM263Record, PROP_SEARCH_ASOF);
                 assertNull(asOfDate);
@@ -879,7 +880,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
                 assertNull(da.getAsOfDate());
 
                 //rma:recordSearchDispositionActionAsOf"
-                nodeService.setProperty(testRM263Record, PROP_PUBLICATION_DATE, new Date());
+                nodeService.setProperty(testRM263Record, DOD5015Model.PROP_PUBLICATION_DATE, new Date());
 
                 return null;
             }
@@ -887,7 +888,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
             @Override
             public void test(Void result) throws Exception
             {
-                Date pubDate = (Date)nodeService.getProperty(testRM263Record, PROP_PUBLICATION_DATE);
+                Date pubDate = (Date)nodeService.getProperty(testRM263Record, DOD5015Model.PROP_PUBLICATION_DATE);
                 assertNotNull(pubDate);
                 Date asOfDate = (Date)nodeService.getProperty(testRM263Record, PROP_SEARCH_ASOF);
                 assertNotNull(asOfDate);
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
similarity index 91%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
index 34983b059b..5b0682cce1 100644
--- a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
@@ -27,6 +27,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
+import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
 import org.alfresco.module.org_alfresco_module_rm.role.Role;
@@ -95,7 +96,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
             {
                 Set<QName> aspects = recordService.getRecordMetaDataAspects();
                 assertNotNull(aspects);
-                assertEquals(5, aspects.size());
+                assertEquals(6, aspects.size());
                 assertTrue(aspects.containsAll(getAspectList()));
 
                 return null;
@@ -108,9 +109,15 @@ public class RecordServiceImplTest extends BaseRMTestCase
              */
             private List<QName> getAspectList()
             {
-                QName[] aspects = new QName[] { DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
-                        DOD5015Model.ASPECT_PDF_RECORD, DOD5015Model.ASPECT_WEB_RECORD,
-                        DOD5015Model.ASPECT_SCANNED_RECORD, ASPECT_RECORD_META_DATA };
+                QName[] aspects = new QName[] 
+                        { 
+                            DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
+                            DOD5015Model.ASPECT_PDF_RECORD, 
+                            DOD5015Model.ASPECT_WEB_RECORD,
+                            DOD5015Model.ASPECT_SCANNED_RECORD, 
+                            ASPECT_RECORD_META_DATA,
+                            DOD5015Model.ASPECT_DOD_5015_RECORD
+                        };
 
                 return Arrays.asList(aspects);
             }
@@ -648,9 +655,9 @@ public class RecordServiceImplTest extends BaseRMTestCase
             @Override
             public void runImpl() throws Exception
             {
-                assertTrue(recordService.isPropertyEditable(recordOne, PROP_ORIGINATING_ORGANIZATION));
+                assertTrue(recordService.isPropertyEditable(recordOne, RecordsManagementModel.PROP_LOCATION));
                 assertTrue(recordService.isPropertyEditable(recordOne, PROP_DESCRIPTION));
-                assertTrue(recordService.isPropertyEditable(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION));
+                assertTrue(recordService.isPropertyEditable(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_DESCRIPTION));
             }
         });
@@ -663,9 +670,9 @@ public class RecordServiceImplTest extends BaseRMTestCase
             {
                 assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(recordOne, RMPermissionModel.READ_RECORDS));
 
-                assertFalse(recordService.isPropertyEditable(recordOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordOne, PROP_DESCRIPTION));
-                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_DESCRIPTION));
             }
         }, rmUserName);
@@ -677,9 +684,9 @@ public class RecordServiceImplTest extends BaseRMTestCase
             @Override
             public void runImpl() throws Exception
             {
-                assertFalse(recordService.isPropertyEditable(recordOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordOne, RecordsManagementModel.PROP_LOCATION));
                 assertTrue(recordService.isPropertyEditable(recordOne, PROP_DESCRIPTION));
-                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_DESCRIPTION));
             }
         }, nonRecordMetadata);
@@ -691,9 +698,9 @@ public class RecordServiceImplTest extends BaseRMTestCase
             @Override
             public void runImpl() throws Exception
             {
-                assertTrue(recordService.isPropertyEditable(recordOne, PROP_ORIGINATING_ORGANIZATION));
+                assertTrue(recordService.isPropertyEditable(recordOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordOne, PROP_DESCRIPTION));
-                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_DESCRIPTION));
             }
         }, recordMetadata);
@@ -705,9 +712,9 @@ public class RecordServiceImplTest extends BaseRMTestCase
             @Override
             public void runImpl() throws Exception
             {
-                assertFalse(recordService.isPropertyEditable(recordOne, PROP_ORIGINATING_ORGANIZATION));
+                assertFalse(recordService.isPropertyEditable(recordOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordOne, PROP_DESCRIPTION));
-                assertTrue(recordService.isPropertyEditable(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION));
+                assertTrue(recordService.isPropertyEditable(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION));
                 assertFalse(recordService.isPropertyEditable(recordDeclaredOne, PROP_DESCRIPTION));
             }
         }, declaredRecordMetadata);
@@ -739,36 +746,36 @@ public class RecordServiceImplTest extends BaseRMTestCase
 
         // test rmadmin
         canEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, rmAdminName);
-        canEditProperty(recordOne, PROP_ORIGINATING_ORGANIZATION, rmAdminName);
+        canEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, rmAdminName);
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, rmAdminName);
-        canEditProperty(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION, rmAdminName);
+        canEditProperty(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION, rmAdminName);
 
         // test normal user
         cantEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, rmUserName);
-        cantEditProperty(recordOne, PROP_ORIGINATING_ORGANIZATION, rmUserName);
+        cantEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, rmUserName);
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, rmUserName);
-        cantEditProperty(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION, rmUserName);
+        cantEditProperty(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION, rmUserName);
 
         // test undeclared record with edit non-record metadata capability
         canEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, nonRecordMetadata);
-        cantEditProperty(recordOne, PROP_ORIGINATING_ORGANIZATION, nonRecordMetadata);
+        cantEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, nonRecordMetadata);
         // test declared record with edit non-record metadata capability
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, nonRecordMetadata);
-        cantEditProperty(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION, nonRecordMetadata);
+        cantEditProperty(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION, nonRecordMetadata);
 
         // test undeclared record with edit record metadata capability
         cantEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, recordMetadata);
-        canEditProperty(recordOne, PROP_ORIGINATING_ORGANIZATION, recordMetadata);
+        canEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, recordMetadata);
         // test declared record with edit record metadata capability
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, recordMetadata);
-        cantEditProperty(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION, recordMetadata);
+        cantEditProperty(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION, recordMetadata);
 
         // test undeclared record with edit declared record metadata capability
         cantEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, declaredRecordMetadata);
-        cantEditProperty(recordOne, PROP_ORIGINATING_ORGANIZATION, declaredRecordMetadata);
+        cantEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, declaredRecordMetadata);
         // test declared record with edit declared record metadata capability
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, declaredRecordMetadata);
-        canEditProperty(recordDeclaredOne, PROP_ORIGINATING_ORGANIZATION, declaredRecordMetadata);
+        canEditProperty(recordDeclaredOne, RecordsManagementModel.PROP_LOCATION, declaredRecordMetadata);
 
     }
 
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
similarity index 92%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
index 420f7cabe2..2c5bfea085 100644
--- a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
@@ -23,6 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
+import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
 import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
@@ -207,13 +208,13 @@ public class CommonRMTestUtils implements RecordsManagementModel
                 try
                 {
                     // Declare record
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_PUBLICATION_DATE, new Date());
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_MEDIA_TYPE, "mediaTypeValue");
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_FORMAT, "formatValue");
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_DATE_RECEIVED, new Date());
+                    nodeService.setProperty(record, DOD5015Model.PROP_PUBLICATION_DATE, new Date());
+                    nodeService.setProperty(record, DOD5015Model.PROP_MEDIA_TYPE, "mediaTypeValue");
+                    nodeService.setProperty(record, DOD5015Model.PROP_FORMAT, "formatValue");
+                    nodeService.setProperty(record, DOD5015Model.PROP_DATE_RECEIVED, new Date());
                     nodeService.setProperty(record, RecordsManagementModel.PROP_DATE_FILED, new Date());
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_ORIGINATOR, "origValue");
-                    nodeService.setProperty(record, RecordsManagementModel.PROP_ORIGINATING_ORGANIZATION, "origOrgValue");
+                    nodeService.setProperty(record, DOD5015Model.PROP_ORIGINATOR, "origValue");
+                    nodeService.setProperty(record, DOD5015Model.PROP_ORIGINATING_ORGANIZATION, "origOrgValue");
                     nodeService.setProperty(record, ContentModel.PROP_TITLE, "titleValue");
                     actionService.executeRecordsManagementAction(record, "declareRecord");
                 }
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/GenerateCapabilityReport.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/GenerateCapabilityReport.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/GenerateCapabilityReport.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/GenerateCapabilityReport.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestDmAction.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestDmAction.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestDmAction.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestDmAction.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestService.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestService.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestService.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestService.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestServiceImpl.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestServiceImpl.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestServiceImpl.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestServiceImpl.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java
diff --git a/rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java
similarity index 100%
rename from rm-server/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java
diff --git a/rm-server/src/test/resources/alfresco/extension/rm-method-security.properties b/rm-server/test/resources/alfresco/extension/rm-method-security.properties
similarity index 100%
rename from rm-server/src/test/resources/alfresco/extension/rm-method-security.properties
rename to rm-server/test/resources/alfresco/extension/rm-method-security.properties
diff --git a/rm-server/src/test/resources/test-context.xml b/rm-server/test/resources/test-context.xml
similarity index 100%
rename from rm-server/src/test/resources/test-context.xml
rename to rm-server/test/resources/test-context.xml
diff --git a/rm-server/src/test/resources/test-filePlan.xml b/rm-server/test/resources/test-filePlan.xml
similarity index 100%
rename from rm-server/src/test/resources/test-filePlan.xml
rename to rm-server/test/resources/test-filePlan.xml
diff --git a/rm-server/src/test/resources/test-model.xml b/rm-server/test/resources/test-model.xml
similarity index 100%
rename from rm-server/src/test/resources/test-model.xml
rename to rm-server/test/resources/test-model.xml
diff --git a/rm-server/src/test/resources/test.properties b/rm-server/test/resources/test.properties
similarity index 100%
rename from rm-server/src/test/resources/test.properties
rename to rm-server/test/resources/test.properties
diff --git a/rm-server/src/test/resources/testCaveatConfig1.json b/rm-server/test/resources/testCaveatConfig1.json
similarity index 100%
rename from rm-server/src/test/resources/testCaveatConfig1.json
rename to rm-server/test/resources/testCaveatConfig1.json
diff --git a/rm-server/src/test/resources/testCaveatConfig2.json b/rm-server/test/resources/testCaveatConfig2.json
similarity index 100%
rename from rm-server/src/test/resources/testCaveatConfig2.json
rename to rm-server/test/resources/testCaveatConfig2.json