diff --git a/dcm/.gitignore b/dcm/.gitignore
new file mode 100644
index 0000000..83a708d
--- /dev/null
+++ b/dcm/.gitignore
@@ -0,0 +1,5 @@
+# ignore compilation related directories in the root of the project
+/build
+/dcm-distros
+/dist
+/lib
\ No newline at end of file
diff --git a/dcm/build.xml b/dcm/build.xml
index 553d936..6aa314a 100644
--- a/dcm/build.xml
+++ b/dcm/build.xml
@@ -28,7 +28,7 @@
   directories from github.
   
 -->
-<project name="dcm" basedir=".">
+<project name="dcm" basedir="." default="distro">
   
   <description>Build DCM components</description>
   
@@ -93,11 +93,12 @@
         <include name="deploy.ant.xml"/>
         <include name="dist/**"/>
         <include name="src/*.x*"/>
+        <exclude name="src/main/**"/>
       </fileset>
     </copy>
     <replace file="tmp/dcm/deploy.ant.xml" token="value=&quot;1&quot;" value="value=&quot;${dcm.version}&quot;"/>
     <copy todir="tmp">
-      <fileset dir="UrbanCode">
+      <fileset dir="src/main/zip">
         <include name="**"/>
       </fileset>
     </copy>
diff --git a/dcm/UrbanCode/RunDeployDotAnt.groovy b/dcm/src/main/zip/RunDeployDotAnt.groovy
similarity index 100%
rename from dcm/UrbanCode/RunDeployDotAnt.groovy
rename to dcm/src/main/zip/RunDeployDotAnt.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/AirPluginTool.groovy b/dcm/src/main/zip/classes/com/urbancode/air/AirPluginTool.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/AirPluginTool.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/AirPluginTool.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/CommandHelper.groovy b/dcm/src/main/zip/classes/com/urbancode/air/CommandHelper.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/CommandHelper.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/CommandHelper.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/DateParser.groovy b/dcm/src/main/zip/classes/com/urbancode/air/DateParser.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/DateParser.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/DateParser.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/ExitCodeException.groovy b/dcm/src/main/zip/classes/com/urbancode/air/ExitCodeException.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/ExitCodeException.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/ExitCodeException.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/FileSet.groovy b/dcm/src/main/zip/classes/com/urbancode/air/FileSet.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/FileSet.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/FileSet.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/Folder.groovy b/dcm/src/main/zip/classes/com/urbancode/air/Folder.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/Folder.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/Folder.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/GsonToObject.groovy b/dcm/src/main/zip/classes/com/urbancode/air/GsonToObject.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/GsonToObject.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/GsonToObject.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/OpenX509TrustManager.groovy b/dcm/src/main/zip/classes/com/urbancode/air/OpenX509TrustManager.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/OpenX509TrustManager.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/OpenX509TrustManager.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/XTrustManagerFactory.groovy b/dcm/src/main/zip/classes/com/urbancode/air/XTrustManagerFactory.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/XTrustManagerFactory.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/XTrustManagerFactory.groovy
diff --git a/dcm/UrbanCode/classes/com/urbancode/air/XTrustProvider.groovy b/dcm/src/main/zip/classes/com/urbancode/air/XTrustProvider.groovy
similarity index 100%
rename from dcm/UrbanCode/classes/com/urbancode/air/XTrustProvider.groovy
rename to dcm/src/main/zip/classes/com/urbancode/air/XTrustProvider.groovy
diff --git a/dcm/UrbanCode/info.xml b/dcm/src/main/zip/info.xml
similarity index 100%
rename from dcm/UrbanCode/info.xml
rename to dcm/src/main/zip/info.xml
diff --git a/dcm/UrbanCode/plugin.xml b/dcm/src/main/zip/plugin.xml
similarity index 100%
rename from dcm/UrbanCode/plugin.xml
rename to dcm/src/main/zip/plugin.xml
diff --git a/dcm/UrbanCode/upgrade.xml b/dcm/src/main/zip/upgrade.xml
similarity index 100%
rename from dcm/UrbanCode/upgrade.xml
rename to dcm/src/main/zip/upgrade.xml