diff --git a/build.properties b/build.properties
index 9a73144a6d..07a1a87a57 100644
--- a/build.properties
+++ b/build.properties
@@ -11,12 +11,13 @@ mvn.exec=${env.MAVEN_HOME}/bin/mvn.bat
 bash.exec=${env.CYGWIN_HOME}/bin/bash
 catalina.exec=${app.tomcat.folder}/bin/catalina.sh
 
-# Maven build directory properties
-mvn.build.directory=target
-mvn.resources.directory=src/main/resources
+# Ant directory properties
+ant.build.directory=target
+ant.config.directory=config
+ant.source.web.directory=source/web
 
 # Tomcat properties
-app.tomcat.folder=${mvn.build.directory}/../../../software/${app.tomcat}
+app.tomcat.folder=${ant.build.directory}/../../../software/${app.tomcat}
 app.tomcat.webapps=${app.tomcat.folder}/webapps
 
 # Application properties
diff --git a/build.xml b/build.xml
index 6e3a3e3f27..3d96d5c6d9 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
    <property environment="env" />
 
    <target name="cleanTarget">
-      <delete dir="${mvn.build.directory}" failonerror="true" />
+      <delete dir="${ant.build.directory}" failonerror="true" />
    </target>
 
    <target name="install" depends="cleanTarget, updateClassPath">
@@ -32,7 +32,7 @@
          <arg value="-DartifactId=${app.war.artifactId}" />
          <arg value="-Dversion=${app.war.version}" />
          <arg value="-Dpackaging=${app.war.packaging}" />
-         <arg value="-Ddest=${mvn.build.directory}/${app.package}" />
+         <arg value="-Ddest=${ant.build.directory}/${app.package}" />
       </exec>
    </target>
 
@@ -57,7 +57,7 @@
    </target>
 
    <target name="copyWarFileToTomcat">
-      <copy file="${mvn.build.directory}/${app.package}" todir="${app.tomcat.webapps}" failonerror="true" />
+      <copy file="${ant.build.directory}/${app.package}" todir="${app.tomcat.webapps}" failonerror="true" />
    </target>
 
    <target name="buildAndDeploy" depends="alfresco:install, copyWarFileToTomcat" description=""/>
@@ -85,8 +85,9 @@
    </target>
 
    <target name="assembleLocalisationPackage" description="">
-      <copy todir="${mvn.build.directory}/i18n/${ant.project.name}/${mvn.resources.directory}" failonerror="true">
-         <fileset dir="${mvn.resources.directory}">
+      <delete dir="${ant.build.directory}/i18n" failonerror="true" />
+	  <copy todir="${ant.build.directory}/i18n/${ant.project.name}/${ant.config.directory}" failonerror="true">
+         <fileset dir="${ant.config.directory}">
             <include name="**/*.properties" />
             <exclude name="**/*_*.properties" />
             <exclude name="**/rm-method-security.properties" />
@@ -99,9 +100,11 @@
    </target>
 
    <target name="assembleIconPackage" description="">
-      <copy todir="${mvn.build.directory}/icons/${ant.project.name}/${mvn.resources.directory}" failonerror="true">
-         <fileset dir="${mvn.resources.directory}">
+      <delete dir="${ant.build.directory}/icons" failonerror="true" />
+	  <copy todir="${ant.build.directory}/icons/${ant.project.name}" failonerror="true">
+		 <fileset dir=".">
             <include name="**/*.png"/>
+			<exclude name="**/${ant.build.directory}/**"/>
          </fileset>
       </copy>
    </target>
@@ -113,18 +116,18 @@
          </not></condition>
       </fail>
       <copy todir="${app.folder}/WEB-INF/lib" failonerror="true">
-         <fileset dir="${mvn.build.directory}">
+         <fileset dir="${ant.build.directory}">
             <include name="*.jar" />
          </fileset>
       </copy>
       <copy todir="${app.folder}/WEB-INF/classes" failonerror="true">
-         <fileset dir="${mvn.resources.directory}">
+         <fileset dir="${ant.config.directory}">
             <exclude name="**/module.properties" />
             <exclude name="**/file-mapping.properties" />
          </fileset>
       </copy>
-      <move todir="${app.folder}" failonerror="false">
-         <fileset dir="${app.folder}/WEB-INF/classes/web"/>
-      </move>
+      <copy todir="${app.folder}" failonerror="false">
+         <fileset dir="${ant.source.web.directory}" />
+      </copy>
    </target>
 </project>
\ No newline at end of file
diff --git a/rm-server/build.xml b/rm-server/build.xml
index 621153ce72..510bf020c6 100644
--- a/rm-server/build.xml
+++ b/rm-server/build.xml
@@ -21,7 +21,7 @@
    <target name="copyDevContextFile">
       <property name="devContextFile" value="../root/projects/repository/config/alfresco/extension/dev-context.xml" />
       <copy file="${devContextFile}" todir="${app.tomcat.folder}/shared/classes/alfresco/extension" failonerror="true" />
-      <copy file="${devContextFile}" todir="src/main/resources/alfresco/extension" failonerror="true" />
+      <copy file="${devContextFile}" todir="config/alfresco/extension" failonerror="true" />
    </target>
 
    <target name="prepareEnv" depends="updateClassPath, copyDBDriver, copyDevContextFile" description="" />
diff --git a/rm-server/config/readme.txt b/rm-server/config/readme.txt
deleted file mode 100644
index 4659be670f..0000000000
--- a/rm-server/config/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-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 6b2bd6adc5..b02eca6175 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -38,7 +38,7 @@
                </execution>
             </executions>
          </plugin>
-         <!-- Additional source folder to be added: src/main/compatibility -->
+         <!-- Additional source folder to be added: source/compatibility -->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/rm-server/source/resources/readme.txt b/rm-server/source/resources/readme.txt
deleted file mode 100644
index c3322908fb..0000000000
--- a/rm-server/source/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Files in this directory will be added to the jar.
\ No newline at end of file