diff --git a/.gitignore b/.gitignore
index f0aee896b52..c2499008ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,10 @@ artifacts
 .waf-*
 waf-*
 target
-override
+premium/
+override/
 .metadata
-dist
+dist/
 *~
 *.bak
 cloud-*.tar.bz2
diff --git a/build.xml b/build.xml
index a676328389a..bf633f6cdf8 100755
--- a/build.xml
+++ b/build.xml
@@ -11,76 +11,31 @@
   
     <dirname property="base.dir" file="${ant.file.Cloud.com Cloud Stack Build Dispatch}"/>
 
-    <condition property="build.dir" value="${base.dir}/build" else="${base.dir}/build"> <!-- silly no-op -->
+    <condition property="build-cloud.properties.file" value="${base.dir}/build/override/build-cloud.properties" else="${base.dir}/build/build-cloud.properties">
+      <available file="${base.dir}/build/override/build-cloud.properties" />
+    </condition>
+  
+    <property file="${build-cloud.properties.file}"/>
+	
+	<property name="premium.name" value="cloudstack-proprietary"/>
+	<property name="premium.base.dir" location="${base.dir}/${premium.name}"/> 
+	
+    <condition property="my.build.dir" value="${premium.base.dir}/build" else="${base.dir}/build"> 
       <and>
-        <available file="cloudstack-proprietary/build/build-cloud-premium.xml"/>
+        <available file="${premium.base.dir}/build"/>
         <not>
           <isset property="OSS"/>
         </not>
       </and>
     </condition>
 
-    <condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
-      <available file="${build.dir}/override/build-cloud.properties" />
-    </condition>
-  
-    <property file="${build-cloud.properties.file}"/>
   
     <property name="dist.dir" location="${base.dir}/dist"/>
     <property name="target.dir" location="${base.dir}/target"/>
 
-    <condition property="build.file" value="cloudstack-proprietary/build/build-cloud-premium.xml" else="${build.dir}/build-cloud.xml">
-      <and>
-        <available file="cloudstack-proprietary/build/build-cloud-premium.xml"/>
-        <not>
-          <isset property="OSS"/>
-        </not>
-      </and>
-    </condition>
-
-    <condition property="package.file" value="cloudstack-proprietary/build/package-premium.xml" else="${build.dir}/package.xml">
-      <and>
-        <available file="cloudstack-proprietary/build/package-premium.xml"/>
-        <not>
-          <isset property="OSS"/>
-        </not>
-      </and>
-    </condition>
-
-    <condition property="developer.file" value="cloudstack-proprietary/build/developer-premium.xml" else="${build.dir}/developer.xml">
-      <and>
-        <available file="cloudstack-proprietary/build/developer-premium.xml"/>
-        <not>
-          <isset property="OSS"/>
-        </not>
-      </and>
-    </condition>
-	
-    <condition property="docs.file" value="cloudstack-proprietary/build/build-docs-premium.xml" else="${build.dir}/build-docs.xml">
-      <and>
-        <available file="cloudstack-proprietary/build/build-docs-premium.xml"/>
-        <not>
-          <isset property="OSS"/>
-        </not>
-      </and>
-    </condition>
-
-    <condition property="test.file" value="cloudstack-proprietary/build/build-tests-premium.xml" else="${build.dir}/build-tests.xml">
-      <and>
-        <available file="cloudstack-proprietary/build/build-tests-premium.xml"/>
-        <not>
-          <isset property="OSS"/>
-        </not>
-      </and>
-    </condition>
-
-    <import file="${base.dir}/cloudstack-proprietary/plugins/zynga/build.xml" optional='true'/>
-    <import file="${build.file}" optional="false"/>
-    <import file="${docs.file}" optional="true"/>
-    <import file="${test.file}" optional="true"/>
-    <import file="${package.file}" optional="true"/>
-    <import file="${developer.file}" optional="true"/>
-  
+    <import file="${my.build.dir}/build-cloud.xml" optional="false"/>
+    <import file="${my.build.dir}/build-docs.xml" optional="true"/>
+    <import file="${my.build.dir}/build-tests.xml" optional="true"/>
+    <import file="${my.build.dir}/package.xml" optional="true"/> 
+    <import file="${my.build.dir}/developer.xml" optional="true"/>
 </project>
-
-
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 9b293704429..676cbf62aa0 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -7,6 +7,7 @@
     </description>
 
   <!--
+  Test
  	Always use this variable to refer to the base directory because this
 	variable is changeable
     -->
@@ -60,7 +61,7 @@
   <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
   <property name="build.log" location="${target.dir}/ant_verbose.txt" />
 
-  <property name="proprietary.dir" location="${base.dir}/cloudstack-proprietary" />
+  <property name="proprietary.dir" location="${base.dir}/${premium.name}" />
 
   <property name="thirdparty.dir" location="${proprietary.dir}/thirdparty" />
   <property name="deps.dir" location="${base.dir}/deps" />
@@ -100,7 +101,7 @@
   <property name="console-viewer.dist.dir" location="${dist.dir}/console-viewer" />
 
   <property name="tools.dir" location="${base.dir}/tools" />
-<!--  <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
+  <!--  <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
   <property name="deploy.dir" location="${build.dir}/deploy" />
   <property name="production.dir" location="${deploy.dir}/production" />
   <property name="meld.home" location="/usr/local/bin" />
@@ -135,7 +136,7 @@
 
   <path id="src.classpath">
   </path>
-     
+
   <path id="thirdparty.classpath">
     <filelist files="${thirdparty.classpath}" />
     <fileset dir="${thirdparty.dir}" erroronmissingdir="false">
@@ -190,8 +191,7 @@
     <copy todir="${scripts.target.dir}">
       <fileset dir="${scripts.dir}">
         <include name="**/*"/>
-        <exclude name="**/.classpath" />
-        <exclude name="**/.project" />
+        <exclude name="**/.*" />
         <exclude name="**/network/domr/mth/" />
         <exclude name="**/network/domr/kvm/" />
         <exclude name="**/network/domr/xenserver/" />
@@ -244,24 +244,40 @@
     <copy todir="${server.dist.dir}/lib">
       <fileset dir="${thirdparty.dir}">
         <include name="mysql-connector-java-5.1.7-bin.jar" />
-	<include name="cglib-nodep-2.2.jar" />
-	<include name="gson-1.3.jar" />
-	<include name="log4j-1.2.15.jar" />
-	<include name="apache-log4j-extras-1.0.jar" />
-	<include name="ehcache-1.5.0.jar" />
-	<include name="commons-logging-1.1.1.jar" />
-	<include name="commons-dbcp-1.2.2.jar" />
-	<include name="commons-pool-1.4.jar" />
-	<include name="backport-util-concurrent-3.0.jar" />
-	<include name="httpcore-4.0.jar" />
-	<include name="commons-httpclient-3.1.jar" />
-	<include name="commons-codec-1.4.jar" />
-	<include name="email.jar" />
-	<include name="xmlrpc-client-3.1.3.jar" />
-	<include name="xmlrpc-common-3.1.3.jar" />
-	<include name="xenserver-5.5.0-1.jar" />
-	<include name="ws-commons-util-1.0.2.jar" />
-	<include name="trilead-ssh2-build213.jar" />
+        <include name="cglib-nodep-2.2.jar" />
+        <include name="gson-1.3.jar" />
+        <include name="log4j-1.2.15.jar" />
+        <include name="apache-log4j-extras-1.0.jar" />
+        <include name="ehcache-1.5.0.jar" />
+        <include name="commons-logging-1.1.1.jar" />
+        <include name="commons-dbcp-1.2.2.jar" />
+        <include name="commons-pool-1.4.jar" />
+        <include name="backport-util-concurrent-3.0.jar" />
+        <include name="httpcore-4.0.jar" />
+        <include name="commons-httpclient-3.1.jar" />
+        <include name="commons-codec-1.4.jar" />
+        <include name="email.jar" />
+        <include name="xmlrpc-client-3.1.3.jar" />
+        <include name="xmlrpc-common-3.1.3.jar" />
+        <include name="xenserver-5.5.0-1.jar" />
+        <include name="ws-commons-util-1.0.2.jar" />
+        <include name="trilead-ssh2-build213.jar" />
+        <include name="vmware-apputils.jar" />
+        <include name="vmware-vim.jar" />
+        <include name="vmware-vim25.jar" />
+        <include name="vmware-lib-activation.jar" />
+        <include name="vmware-lib-axis.jar" />
+        <include name="vmware-lib-jaxen-core.jar" />
+        <include name="vmware-lib-jaxen-jdom.jar" />
+        <include name="vmware-lib-jaxrpc.jar" />
+        <include name="vmware-lib-jdom.jar" />
+        <include name="vmware-lib-mailapi.jar" />
+        <include name="vmware-lib-saxpath.jar" />
+        <include name="vmware-lib-smtp.jar" />
+        <include name="vmware-lib-wbem.jar" />
+        <include name="vmware-lib-xalan.jar" />
+        <include name="vmware-lib-xerces.jar" />
+        <include name="vmware-lib-xml-apis.jar" />
       </fileset>
     </copy>
 
@@ -276,12 +292,12 @@
         </filterreader>
       </filterchain>
     </copy>
-  	
+
     <copy overwrite="true" todir="${server.dist.dir}/conf">
-        <fileset dir="${server.dir}/src/com/cloud/migration">
-          <include name="*.xml" />
-        </fileset>
-  	</copy>
+      <fileset dir="${server.dir}/src/com/cloud/migration">
+        <include name="*.xml" />
+      </fileset>
+    </copy>
   </target>
 
   <path id="console-common.classpath">
@@ -315,7 +331,7 @@
       <fileset dir="${thirdparty.dir}">
         <include name="log4j-1.2.15.jar" />
         <include name="apache-log4j-extras-1.0.jar" />
-         <include name="gson-1.3.jar" />
+        <include name="gson-1.3.jar" />
       </fileset>
     </copy>
 
@@ -488,20 +504,20 @@
     <chmod file="${dist.dir}/deploy-agent.sh" perm="uog+xr" />
     <chmod file="${dist.dir}/deploy-server.sh" perm="uog+xr" />
   </target>
- 
-	
-  <target name="build-kvm-domr-patch" depends="-init">		
+
+
+  <target name="build-kvm-domr-patch" depends="-init">
     <tar destfile="${dist.dir}/patch.tar">
-	  <tarfileset dir="${base.dir}/patches/kvm" filemode="755">
-	    <include name="**/*"/>
-            <exclude name="**/.classpath" />
-            <exclude name="**/.project" />
-	  </tarfileset>
-	  <tarfileset dir="${base.dir}/patches/shared" filemode="755">
-            <include name="**/*"/>
-            <exclude name="**/.classpath" />
-            <exclude name="**/.project" />
-          </tarfileset>
+      <tarfileset dir="${base.dir}/patches/kvm" filemode="755">
+        <include name="**/*"/>
+        <exclude name="**/.classpath" />
+        <exclude name="**/.project" />
+      </tarfileset>
+      <tarfileset dir="${base.dir}/patches/shared" filemode="755">
+        <include name="**/*"/>
+        <exclude name="**/.classpath" />
+        <exclude name="**/.project" />
+      </tarfileset>
     </tar>
     <gzip destfile="${dist.dir}/patch.tgz" src="${dist.dir}/patch.tar"/>
     <delete file="${dist.dir}/patch.tar"/>
@@ -520,7 +536,7 @@
 
     <!-- create a UTC build timestamp using ISO 8601 formatting -->
     <tstamp>
-      <format property="utc.build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" timezone="GMT" />
+      <format property="utc.build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" timezone="GMT" />
     </tstamp>
 
     <!-- remember who/where did the build -->
@@ -532,9 +548,9 @@
 
     <!-- set build.number property, stored in eponymous file -->
     <buildnumber file="${build.dir}/build.number" />
-    <condition property="impl.version" value="${version}.${manual.build.number}" else="${version}.${build.number}">
-       <isset property="manual.build.number"/>
-     </condition>
+    <condition property="impl.version" value="${version}.${manual.build.number}" else="${version}.${utc.build.timestamp}">
+      <isset property="manual.build.number"/>
+    </condition>
 
     <echo message="Build number is ${impl.version}" />
 
diff --git a/build/build-common.xml b/build/build-common.xml
index ae2f814f1bd..2131093314e 100755
--- a/build/build-common.xml
+++ b/build/build-common.xml
@@ -44,6 +44,7 @@
         
       <depend srcdir="@{top.dir}/src" destdir="${classes.dir}/@{jar.name}" cache="${dep.cache.dir}" />
         
+   	  <echo message="Compiling @{top.dir}/src"/>
       <javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6">
         <!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ -->
         <!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ -->
diff --git a/build/developer.xml b/build/developer.xml
index 9bb2d33e6e3..0928e48dfd6 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -27,6 +27,18 @@
   <target name="run" depends="start-tomcat"/>
   <target name="stop" depends="stop-tomcat"/>
   <target name="debug" depends="debug-tomcat"/>
+
+  <target name="setup">
+	<mkdir dir="${build.dir}/override"/>   
+    <copy todir="${build.dir}/override">
+	  <fileset dir="${build.dir}">
+	    <include name="build-cloud.properties"/>
+	    <include name="replace.properties"/>
+	  </fileset>
+	</copy>  
+    <loadproperties srcfile="${build.dir}/override/replace.properties" resource="propertyresource"/>
+    <!-- propertyfile file="${build.dir}/override/replace.properties"/ -->
+  </target>
   
   <target name="debug-suspend">
     <java jar="${tomcat.home}/bin/bootstrap.jar" fork="true">
@@ -86,23 +98,11 @@
   <target name="unzip-usage" if="usagezip.uptodate">
     <unzip src="${deploy.work.dir}/usage.zip" dest="${deploy.work.dir}/usage"/>
   </target>
-  <!--
-  <target name="deploy-db">
-    <property file="
-    <sql
-        driver="com.mysql.jdbc.Driver"
-        url="jdbc:database-url"
-        userid="cloud"
-        password="cloud"
-        src="data.sql"
-    />
-  </target>
--->
+    
   <target name="deploy-server" depends="deploy-common" >
     <copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/vms" file="${dist.dir}/systemvm.zip" />
   </target>
 
-
   <target name="deploy-common" > 
     <condition property="zip.uptodate">
       <available file="${deploy.work.dir}/client.zip" type="file"/>
diff --git a/build/package.xml b/build/package.xml
index 160c648287f..82781c61a2f 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -72,6 +72,7 @@
         <include name="${agent.jar}" />
         <include name="${utils.jar}" />
         <include name="${core.jar}" />
+        <include name="${api.jar}" />
       </zipfileset>
 
       <zipfileset dir="${agent.dist.dir}" filemode="770">
@@ -131,14 +132,13 @@
     <war destfile="${client.dist.dir}/client.war" webxml="${client.dir}/WEB-INF/web.xml">
       <fileset dir="${client.target.dir}">
         <include name="**/*" />
+      	<exclude name="**/*.properties" />
       </fileset>
       <classes dir="${client.target.dir}">
     	  <include name="**/resources/*.properties" />
       </classes>
       <lib dir="${jar.dir}">
-        <include name="${core.jar}" />
-        <include name="${utils.jar}" />
-        <include name="${server.jar}" />
+        <include name="cloud-*.jar" />
       </lib>
       <zipfileset dir="${scripts.target.dir}" prefix="WEB-INF/lib/scripts" filemode="555">
         <include name="**/*" />
@@ -168,6 +168,7 @@
         <include name="${agent.jar}" />
         <include name="${utils.jar}" />
         <include name="${core.jar}" />
+        <include name="${api.jar}" />
       </zipfileset>
       <zipfileset dir="${console-proxy.dist.dir}">
         <exclude name="**/*.sh" />