diff --git a/client/pom.xml b/client/pom.xml
index 119c96eddef..c09e10e7cb5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -277,8 +277,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-console-proxy</artifactId>
+      <artifactId>cloud-systemvm</artifactId>
       <version>${project.version}</version>
+      <type>pom</type>
     </dependency>
   </dependencies>
   <build>
@@ -361,7 +362,7 @@
             <configuration>
               <target>
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
-                  <fileset dir="${basedir}/../services/console-proxy/server/dist">
+                  <fileset dir="${basedir}/../systemvm/dist">
                     <include name="systemvm.zip" />
                     <include name="systemvm.iso" />
                   </fileset>
diff --git a/pom.xml b/pom.xml
index 4bae29a3796..cb4dd1d0943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,6 @@
     <module>deps/XenServerJava</module>
     <module>engine</module>
     <module>plugins</module>
-    <module>patches</module>
     <module>framework</module>
     <module>test</module>
     <module>client</module>
@@ -680,6 +679,12 @@
         <module>awsapi</module>
       </modules>
     </profile>
+    <profile>
+      <id>systemvm</id>
+      <modules>
+        <module>systemvm</module>
+      </modules>
+    </profile>
     <profile>
       <id>eclipse</id>
       <properties>
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 391c15a5b29..114979025d8 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -26,9 +26,6 @@
     <version>4.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <properties>
-    <mkisofs>mkisofs</mkisofs>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>log4j</groupId>
@@ -42,21 +39,9 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <!-- required deps for the systemvm -->
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-agent</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-patches</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-secondary-storage</artifactId>
+      <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
@@ -69,231 +54,5 @@
         </excludes>
       </resource>
     </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <finalName>systemvm</finalName>
-          <appendAssemblyId>false</appendAssemblyId>
-          <descriptors>
-            <descriptor>systemvm-descriptor.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-systemvm</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <!-- here the phase you need -->
-            <phase>package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>dist</outputDirectory>
-              <resources>          
-                <resource>
-                  <directory>target</directory>
-                  <includes>
-                    <include>systemvm.zip</include>
-                  </includes>
-                </resource>
-                <resource>
-                  <directory>../../../patches/systemvm/debian/config/root/.ssh</directory>
-                  <includes>
-                    <include>authorized_keys</include>
-                  </includes>
-                </resource>
-              </resources>              
-            </configuration>            
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>copy-cloud-scripts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy overwrite="true" file="../../../patches/target/cloud-scripts.tgz" tofile="${basedir}/dist/cloud-scripts.tgz"/>  
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-            <filesets>
-                <fileset>
-                    <directory>dist</directory>
-                    <followSymlinks>false</followSymlinks>
-                </fileset>
-                <fileset>
-                    <directory>target</directory>
-                    <followSymlinks>false</followSymlinks>
-                </fileset>
-            </filesets>
-        </configuration>
-    </plugin>
-<!-- Leave this to the systemvm profile
-     Enable using the -P systemvm flag
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>mkisofs</executable>
-          <workingDirectory>dist</workingDirectory>
-          <arguments>
-            <argument>-quiet</argument>
-            <argument>-r</argument>
-            <argument>-o</argument>
-            <argument>systemvm.iso</argument>
-            <argument>systemvm.zip</argument>
-            <argument>cloud-scripts.tgz</argument>
-            <argument>authorized_keys</argument>
-          </arguments>
-        </configuration>
-      </plugin>
--->
-    </plugins>
   </build>
-  <profiles>
-    <!-- Debian will never distribute mkisofs due to licensing issues.
-         Fortunately genisoimage is a work-alike -->
-    <profile>
-      <id>genisoimage</id>
-      <activation>
-        <file>
-          <exists>/usr/bin/genisoimage</exists>
-        </file>
-      </activation>
-      <properties>
-        <mkisofs>genisoimage</mkisofs>
-      </properties>
-    </profile>
-    <profile>
-      <id>vmware</id>
-      <activation>
-        <property>
-          <name>nonoss</name>
-        </property>
-      </activation>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.cloudstack</groupId>
-                <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cloudstack</groupId>
-                <artifactId>cloud-vmware-base</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </profile>
-    <profile>
-      <id>systemvm</id>
-      <activation>
-        <property>
-          <name>systemvm</name>
-        </property>
-      </activation>
-      <build>
-      <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>${mkisofs}</executable>
-          <workingDirectory>dist</workingDirectory>
-          <arguments>
-            <argument>-quiet</argument>
-            <argument>-r</argument>
-            <argument>-o</argument>
-            <argument>systemvm.iso</argument>
-            <argument>systemvm.zip</argument>
-            <argument>cloud-scripts.tgz</argument>
-            <argument>authorized_keys</argument>
-          </arguments>
-        </configuration>
-      </plugin>
-      </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>quickcloud</id>
-      <build>
-      <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>com.cloud.agent.AgentShell</mainClass>
-          <arguments>
-            <argument>zone=1</argument>
-            <argument>pod=1</argument>
-            <argument>host=192.168.56.1</argument>
-            <argument>guid=ConsoleProxy.1</argument>
-          </arguments>
-          <systemProperties>
-            <systemProperty>
-              <key>javax.net.ssl.trustStore</key>
-              <value>certs/realhostip.keystore</value>
-              <key>log.home</key>
-              <value>${PWD}/</value>
-            </systemProperty>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      </plugins>
-    </build>
-  </profile>
-  </profiles>
-
 </project>
diff --git a/services/console-proxy/server/bindir/cloud-setup-console-proxy.in b/systemvm/bindir/cloud-setup-console-proxy.in
similarity index 100%
rename from services/console-proxy/server/bindir/cloud-setup-console-proxy.in
rename to systemvm/bindir/cloud-setup-console-proxy.in
diff --git a/services/console-proxy/server/certs/localhost.crt b/systemvm/certs/localhost.crt
similarity index 100%
rename from services/console-proxy/server/certs/localhost.crt
rename to systemvm/certs/localhost.crt
diff --git a/services/console-proxy/server/certs/localhost.key b/systemvm/certs/localhost.key
similarity index 100%
rename from services/console-proxy/server/certs/localhost.key
rename to systemvm/certs/localhost.key
diff --git a/services/console-proxy/server/certs/realhostip.crt b/systemvm/certs/realhostip.crt
similarity index 100%
rename from services/console-proxy/server/certs/realhostip.crt
rename to systemvm/certs/realhostip.crt
diff --git a/services/console-proxy/server/certs/realhostip.csr b/systemvm/certs/realhostip.csr
similarity index 100%
rename from services/console-proxy/server/certs/realhostip.csr
rename to systemvm/certs/realhostip.csr
diff --git a/services/console-proxy/server/certs/realhostip.key b/systemvm/certs/realhostip.key
similarity index 100%
rename from services/console-proxy/server/certs/realhostip.key
rename to systemvm/certs/realhostip.key
diff --git a/services/console-proxy/server/certs/realhostip.keystore b/systemvm/certs/realhostip.keystore
similarity index 100%
rename from services/console-proxy/server/certs/realhostip.keystore
rename to systemvm/certs/realhostip.keystore
diff --git a/patches/cloudpatch-descriptor.xml b/systemvm/cloudpatch-descriptor.xml
similarity index 100%
rename from patches/cloudpatch-descriptor.xml
rename to systemvm/cloudpatch-descriptor.xml
diff --git a/services/console-proxy/server/conf.dom0/agent.properties.in b/systemvm/conf.dom0/agent.properties.in
similarity index 100%
rename from services/console-proxy/server/conf.dom0/agent.properties.in
rename to systemvm/conf.dom0/agent.properties.in
diff --git a/services/console-proxy/server/conf.dom0/consoleproxy.properties.in b/systemvm/conf.dom0/consoleproxy.properties.in
similarity index 100%
rename from services/console-proxy/server/conf.dom0/consoleproxy.properties.in
rename to systemvm/conf.dom0/consoleproxy.properties.in
diff --git a/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in b/systemvm/conf.dom0/log4j-cloud.xml.in
similarity index 100%
rename from services/console-proxy/server/conf.dom0/log4j-cloud.xml.in
rename to systemvm/conf.dom0/log4j-cloud.xml.in
diff --git a/services/console-proxy/server/conf/agent.properties b/systemvm/conf/agent.properties
similarity index 100%
rename from services/console-proxy/server/conf/agent.properties
rename to systemvm/conf/agent.properties
diff --git a/services/console-proxy/server/conf/consoleproxy.properties b/systemvm/conf/consoleproxy.properties
similarity index 100%
rename from services/console-proxy/server/conf/consoleproxy.properties
rename to systemvm/conf/consoleproxy.properties
diff --git a/services/console-proxy/server/conf/environment.properties b/systemvm/conf/environment.properties
similarity index 100%
rename from services/console-proxy/server/conf/environment.properties
rename to systemvm/conf/environment.properties
diff --git a/services/console-proxy/server/conf/log4j-cloud.xml b/systemvm/conf/log4j-cloud.xml
similarity index 100%
rename from services/console-proxy/server/conf/log4j-cloud.xml
rename to systemvm/conf/log4j-cloud.xml
diff --git a/services/console-proxy/server/css/ajaxviewer.css b/systemvm/css/ajaxviewer.css
similarity index 100%
rename from services/console-proxy/server/css/ajaxviewer.css
rename to systemvm/css/ajaxviewer.css
diff --git a/services/console-proxy/server/css/logger.css b/systemvm/css/logger.css
similarity index 100%
rename from services/console-proxy/server/css/logger.css
rename to systemvm/css/logger.css
diff --git a/services/console-proxy/server/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
similarity index 100%
rename from services/console-proxy/server/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
rename to systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
diff --git a/services/console-proxy/server/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
similarity index 100%
rename from services/console-proxy/server/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
rename to systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
diff --git a/services/console-proxy/server/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
similarity index 100%
rename from services/console-proxy/server/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
rename to systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
diff --git a/services/console-proxy/server/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
similarity index 100%
rename from services/console-proxy/server/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
rename to systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
diff --git a/services/console-proxy/server/images/back.gif b/systemvm/images/back.gif
similarity index 100%
rename from services/console-proxy/server/images/back.gif
rename to systemvm/images/back.gif
diff --git a/services/console-proxy/server/images/bright-green.png b/systemvm/images/bright-green.png
similarity index 100%
rename from services/console-proxy/server/images/bright-green.png
rename to systemvm/images/bright-green.png
diff --git a/services/console-proxy/server/images/cad.gif b/systemvm/images/cad.gif
similarity index 100%
rename from services/console-proxy/server/images/cad.gif
rename to systemvm/images/cad.gif
diff --git a/services/console-proxy/server/images/cannotconnect.jpg b/systemvm/images/cannotconnect.jpg
similarity index 100%
rename from services/console-proxy/server/images/cannotconnect.jpg
rename to systemvm/images/cannotconnect.jpg
diff --git a/services/console-proxy/server/images/clr_button.gif b/systemvm/images/clr_button.gif
similarity index 100%
rename from services/console-proxy/server/images/clr_button.gif
rename to systemvm/images/clr_button.gif
diff --git a/services/console-proxy/server/images/clr_button_hover.gif b/systemvm/images/clr_button_hover.gif
similarity index 100%
rename from services/console-proxy/server/images/clr_button_hover.gif
rename to systemvm/images/clr_button_hover.gif
diff --git a/services/console-proxy/server/images/dot.cur b/systemvm/images/dot.cur
similarity index 100%
rename from services/console-proxy/server/images/dot.cur
rename to systemvm/images/dot.cur
diff --git a/services/console-proxy/server/images/gray-green.png b/systemvm/images/gray-green.png
similarity index 100%
rename from services/console-proxy/server/images/gray-green.png
rename to systemvm/images/gray-green.png
diff --git a/services/console-proxy/server/images/grid_headerbg.gif b/systemvm/images/grid_headerbg.gif
similarity index 100%
rename from services/console-proxy/server/images/grid_headerbg.gif
rename to systemvm/images/grid_headerbg.gif
diff --git a/services/console-proxy/server/images/left.png b/systemvm/images/left.png
similarity index 100%
rename from services/console-proxy/server/images/left.png
rename to systemvm/images/left.png
diff --git a/services/console-proxy/server/images/minimize_button.gif b/systemvm/images/minimize_button.gif
similarity index 100%
rename from services/console-proxy/server/images/minimize_button.gif
rename to systemvm/images/minimize_button.gif
diff --git a/services/console-proxy/server/images/minimize_button_hover.gif b/systemvm/images/minimize_button_hover.gif
similarity index 100%
rename from services/console-proxy/server/images/minimize_button_hover.gif
rename to systemvm/images/minimize_button_hover.gif
diff --git a/services/console-proxy/server/images/notready.jpg b/systemvm/images/notready.jpg
similarity index 100%
rename from services/console-proxy/server/images/notready.jpg
rename to systemvm/images/notready.jpg
diff --git a/services/console-proxy/server/images/play_button.gif b/systemvm/images/play_button.gif
similarity index 100%
rename from services/console-proxy/server/images/play_button.gif
rename to systemvm/images/play_button.gif
diff --git a/services/console-proxy/server/images/play_button_hover.gif b/systemvm/images/play_button_hover.gif
similarity index 100%
rename from services/console-proxy/server/images/play_button_hover.gif
rename to systemvm/images/play_button_hover.gif
diff --git a/services/console-proxy/server/images/right.png b/systemvm/images/right.png
similarity index 100%
rename from services/console-proxy/server/images/right.png
rename to systemvm/images/right.png
diff --git a/services/console-proxy/server/images/right2.png b/systemvm/images/right2.png
similarity index 100%
rename from services/console-proxy/server/images/right2.png
rename to systemvm/images/right2.png
diff --git a/services/console-proxy/server/images/shrink_button.gif b/systemvm/images/shrink_button.gif
similarity index 100%
rename from services/console-proxy/server/images/shrink_button.gif
rename to systemvm/images/shrink_button.gif
diff --git a/services/console-proxy/server/images/shrink_button_hover.gif b/systemvm/images/shrink_button_hover.gif
similarity index 100%
rename from services/console-proxy/server/images/shrink_button_hover.gif
rename to systemvm/images/shrink_button_hover.gif
diff --git a/services/console-proxy/server/images/stop_button.gif b/systemvm/images/stop_button.gif
similarity index 100%
rename from services/console-proxy/server/images/stop_button.gif
rename to systemvm/images/stop_button.gif
diff --git a/services/console-proxy/server/images/stop_button_hover.gif b/systemvm/images/stop_button_hover.gif
similarity index 100%
rename from services/console-proxy/server/images/stop_button_hover.gif
rename to systemvm/images/stop_button_hover.gif
diff --git a/services/console-proxy/server/images/winlog.png b/systemvm/images/winlog.png
similarity index 100%
rename from services/console-proxy/server/images/winlog.png
rename to systemvm/images/winlog.png
diff --git a/services/console-proxy/server/js/ajaxkeys.js b/systemvm/js/ajaxkeys.js
similarity index 100%
rename from services/console-proxy/server/js/ajaxkeys.js
rename to systemvm/js/ajaxkeys.js
diff --git a/services/console-proxy/server/js/ajaxviewer.js b/systemvm/js/ajaxviewer.js
similarity index 100%
rename from services/console-proxy/server/js/ajaxviewer.js
rename to systemvm/js/ajaxviewer.js
diff --git a/services/console-proxy/server/js/cloud.logger.js b/systemvm/js/cloud.logger.js
similarity index 100%
rename from services/console-proxy/server/js/cloud.logger.js
rename to systemvm/js/cloud.logger.js
diff --git a/services/console-proxy/server/js/handler.js b/systemvm/js/handler.js
similarity index 100%
rename from services/console-proxy/server/js/handler.js
rename to systemvm/js/handler.js
diff --git a/services/console-proxy/server/js/jquery.js b/systemvm/js/jquery.js
similarity index 100%
rename from services/console-proxy/server/js/jquery.js
rename to systemvm/js/jquery.js
diff --git a/services/console-proxy/server/libexec/console-proxy-runner.in b/systemvm/libexec/console-proxy-runner.in
similarity index 100%
rename from services/console-proxy/server/libexec/console-proxy-runner.in
rename to systemvm/libexec/console-proxy-runner.in
diff --git a/patches/systemvm/debian/README b/systemvm/patches/debian/README
similarity index 100%
rename from patches/systemvm/debian/README
rename to systemvm/patches/debian/README
diff --git a/patches/systemvm/debian/buildsystemvm.sh b/systemvm/patches/debian/buildsystemvm.sh
similarity index 100%
rename from patches/systemvm/debian/buildsystemvm.sh
rename to systemvm/patches/debian/buildsystemvm.sh
diff --git a/patches/systemvm/debian/config.dat b/systemvm/patches/debian/config.dat
similarity index 100%
rename from patches/systemvm/debian/config.dat
rename to systemvm/patches/debian/config.dat
diff --git a/patches/systemvm/debian/config/etc/apache2/httpd.conf b/systemvm/patches/debian/config/etc/apache2/httpd.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/apache2/httpd.conf
rename to systemvm/patches/debian/config/etc/apache2/httpd.conf
diff --git a/patches/systemvm/debian/config/etc/apache2/ports.conf b/systemvm/patches/debian/config/etc/apache2/ports.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/apache2/ports.conf
rename to systemvm/patches/debian/config/etc/apache2/ports.conf
diff --git a/patches/systemvm/debian/config/etc/apache2/sites-available/default b/systemvm/patches/debian/config/etc/apache2/sites-available/default
similarity index 100%
rename from patches/systemvm/debian/config/etc/apache2/sites-available/default
rename to systemvm/patches/debian/config/etc/apache2/sites-available/default
diff --git a/patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl b/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
similarity index 100%
rename from patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl
rename to systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
diff --git a/patches/systemvm/debian/config/etc/apache2/vhostexample.conf b/systemvm/patches/debian/config/etc/apache2/vhostexample.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/apache2/vhostexample.conf
rename to systemvm/patches/debian/config/etc/apache2/vhostexample.conf
diff --git a/patches/systemvm/debian/config/etc/cloud-nic.rules b/systemvm/patches/debian/config/etc/cloud-nic.rules
similarity index 100%
rename from patches/systemvm/debian/config/etc/cloud-nic.rules
rename to systemvm/patches/debian/config/etc/cloud-nic.rules
diff --git a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup b/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup
similarity index 100%
rename from patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup
rename to systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup
diff --git a/patches/systemvm/debian/config/etc/default/cloud b/systemvm/patches/debian/config/etc/default/cloud
similarity index 100%
rename from patches/systemvm/debian/config/etc/default/cloud
rename to systemvm/patches/debian/config/etc/default/cloud
diff --git a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr b/systemvm/patches/debian/config/etc/default/cloud-passwd-srvr
similarity index 100%
rename from patches/systemvm/debian/config/etc/default/cloud-passwd-srvr
rename to systemvm/patches/debian/config/etc/default/cloud-passwd-srvr
diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl b/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
similarity index 100%
rename from patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl
rename to systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
diff --git a/patches/systemvm/debian/config/etc/haproxy/haproxy.cfg b/systemvm/patches/debian/config/etc/haproxy/haproxy.cfg
similarity index 100%
rename from patches/systemvm/debian/config/etc/haproxy/haproxy.cfg
rename to systemvm/patches/debian/config/etc/haproxy/haproxy.cfg
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud b/systemvm/patches/debian/config/etc/init.d/cloud
similarity index 100%
rename from patches/systemvm/debian/config/etc/init.d/cloud
rename to systemvm/patches/debian/config/etc/init.d/cloud
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
similarity index 100%
rename from patches/systemvm/debian/config/etc/init.d/cloud-early-config
rename to systemvm/patches/debian/config/etc/init.d/cloud-early-config
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr b/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
similarity index 100%
rename from patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr
rename to systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
diff --git a/patches/systemvm/debian/config/etc/init.d/postinit b/systemvm/patches/debian/config/etc/init.d/postinit
similarity index 100%
rename from patches/systemvm/debian/config/etc/init.d/postinit
rename to systemvm/patches/debian/config/etc/init.d/postinit
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy b/systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy
rename to systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-elbvm b/systemvm/patches/debian/config/etc/iptables/iptables-elbvm
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-elbvm
rename to systemvm/patches/debian/config/etc/iptables/iptables-elbvm
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm b/systemvm/patches/debian/config/etc/iptables/iptables-ilbvm
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-ilbvm
rename to systemvm/patches/debian/config/etc/iptables/iptables-ilbvm
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-router b/systemvm/patches/debian/config/etc/iptables/iptables-router
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-router
rename to systemvm/patches/debian/config/etc/iptables/iptables-router
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage b/systemvm/patches/debian/config/etc/iptables/iptables-secstorage
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-secstorage
rename to systemvm/patches/debian/config/etc/iptables/iptables-secstorage
diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter b/systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter
rename to systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter
diff --git a/patches/systemvm/debian/config/etc/iptables/rt_tables_init b/systemvm/patches/debian/config/etc/iptables/rt_tables_init
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/rt_tables_init
rename to systemvm/patches/debian/config/etc/iptables/rt_tables_init
diff --git a/patches/systemvm/debian/config/etc/iptables/rules b/systemvm/patches/debian/config/etc/iptables/rules
similarity index 100%
rename from patches/systemvm/debian/config/etc/iptables/rules
rename to systemvm/patches/debian/config/etc/iptables/rules
diff --git a/patches/systemvm/debian/config/etc/logrotate.conf b/systemvm/patches/debian/config/etc/logrotate.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.conf
rename to systemvm/patches/debian/config/etc/logrotate.conf
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/config/etc/logrotate.d/apache2
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.d/apache2
rename to systemvm/patches/debian/config/etc/logrotate.d/apache2
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.d/dnsmasq
rename to systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/config/etc/logrotate.d/haproxy
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.d/haproxy
rename to systemvm/patches/debian/config/etc/logrotate.d/haproxy
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/config/etc/logrotate.d/ppp
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.d/ppp
rename to systemvm/patches/debian/config/etc/logrotate.d/ppp
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
similarity index 100%
rename from patches/systemvm/debian/config/etc/logrotate.d/rsyslog
rename to systemvm/patches/debian/config/etc/logrotate.d/rsyslog
diff --git a/patches/systemvm/debian/config/etc/modprobe.d/aesni_intel b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
similarity index 100%
rename from patches/systemvm/debian/config/etc/modprobe.d/aesni_intel
rename to systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
diff --git a/patches/systemvm/debian/config/etc/profile.d/cloud.sh b/systemvm/patches/debian/config/etc/profile.d/cloud.sh
similarity index 100%
rename from patches/systemvm/debian/config/etc/profile.d/cloud.sh
rename to systemvm/patches/debian/config/etc/profile.d/cloud.sh
diff --git a/patches/systemvm/debian/config/etc/rc.local b/systemvm/patches/debian/config/etc/rc.local
similarity index 100%
rename from patches/systemvm/debian/config/etc/rc.local
rename to systemvm/patches/debian/config/etc/rc.local
diff --git a/patches/systemvm/debian/config/etc/rsyslog.conf b/systemvm/patches/debian/config/etc/rsyslog.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/rsyslog.conf
rename to systemvm/patches/debian/config/etc/rsyslog.conf
diff --git a/patches/systemvm/debian/config/etc/ssh/sshd_config b/systemvm/patches/debian/config/etc/ssh/sshd_config
similarity index 100%
rename from patches/systemvm/debian/config/etc/ssh/sshd_config
rename to systemvm/patches/debian/config/etc/ssh/sshd_config
diff --git a/patches/systemvm/debian/config/etc/sysctl.conf b/systemvm/patches/debian/config/etc/sysctl.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/sysctl.conf
rename to systemvm/patches/debian/config/etc/sysctl.conf
diff --git a/patches/systemvm/debian/config/etc/vpcdnsmasq.conf b/systemvm/patches/debian/config/etc/vpcdnsmasq.conf
similarity index 100%
rename from patches/systemvm/debian/config/etc/vpcdnsmasq.conf
rename to systemvm/patches/debian/config/etc/vpcdnsmasq.conf
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checkbatchs2svpn.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/checkbatchs2svpn.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh b/systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh b/systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/get_template_version.sh b/systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/get_template_version.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ilb.sh b/systemvm/patches/debian/config/opt/cloud/bin/ilb.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/ilb.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/ilb.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/netusage.sh b/systemvm/patches/debian/config/opt/cloud/bin/netusage.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/netusage.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/netusage.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/passwd_server
rename to systemvm/patches/debian/config/opt/cloud/bin/passwd_server
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip
rename to systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vmdata.py
rename to systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_acl.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_acl.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_acl.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_acl.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_func.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_func.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_ipassoc.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_ipassoc.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_loadbalancer.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_loadbalancer.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_loadbalancer.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_loadbalancer.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server b/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_portforwarding.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_portforwarding.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_portforwarding.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_portforwarding.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_privateGateway.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_privateGateway.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_privategw_acl.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_privategw_acl.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_privategw_acl.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_privategw_acl.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_staticnat.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticnat.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_staticnat.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_staticnat.sh
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_staticroute.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh
similarity index 100%
rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_staticroute.sh
rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh
diff --git a/patches/systemvm/debian/config/root/.ssh/authorized_keys b/systemvm/patches/debian/config/root/.ssh/authorized_keys
similarity index 100%
rename from patches/systemvm/debian/config/root/.ssh/authorized_keys
rename to systemvm/patches/debian/config/root/.ssh/authorized_keys
diff --git a/patches/systemvm/debian/config/root/bumpup_priority.sh b/systemvm/patches/debian/config/root/bumpup_priority.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/bumpup_priority.sh
rename to systemvm/patches/debian/config/root/bumpup_priority.sh
diff --git a/patches/systemvm/debian/config/root/clearUsageRules.sh b/systemvm/patches/debian/config/root/clearUsageRules.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/clearUsageRules.sh
rename to systemvm/patches/debian/config/root/clearUsageRules.sh
diff --git a/patches/systemvm/debian/config/root/createIpAlias.sh b/systemvm/patches/debian/config/root/createIpAlias.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/createIpAlias.sh
rename to systemvm/patches/debian/config/root/createIpAlias.sh
diff --git a/patches/systemvm/debian/config/root/deleteIpAlias.sh b/systemvm/patches/debian/config/root/deleteIpAlias.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/deleteIpAlias.sh
rename to systemvm/patches/debian/config/root/deleteIpAlias.sh
diff --git a/patches/systemvm/debian/config/root/dnsmasq.sh b/systemvm/patches/debian/config/root/dnsmasq.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/dnsmasq.sh
rename to systemvm/patches/debian/config/root/dnsmasq.sh
diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/edithosts.sh
rename to systemvm/patches/debian/config/root/edithosts.sh
diff --git a/patches/systemvm/debian/config/root/firewall.sh b/systemvm/patches/debian/config/root/firewall.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/firewall.sh
rename to systemvm/patches/debian/config/root/firewall.sh
diff --git a/patches/systemvm/debian/config/root/firewallRule_egress.sh b/systemvm/patches/debian/config/root/firewallRule_egress.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/firewallRule_egress.sh
rename to systemvm/patches/debian/config/root/firewallRule_egress.sh
diff --git a/patches/systemvm/debian/config/root/firewall_rule.sh b/systemvm/patches/debian/config/root/firewall_rule.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/firewall_rule.sh
rename to systemvm/patches/debian/config/root/firewall_rule.sh
diff --git a/patches/systemvm/debian/config/root/func.sh b/systemvm/patches/debian/config/root/func.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/func.sh
rename to systemvm/patches/debian/config/root/func.sh
diff --git a/patches/systemvm/debian/config/root/loadbalancer.sh b/systemvm/patches/debian/config/root/loadbalancer.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/loadbalancer.sh
rename to systemvm/patches/debian/config/root/loadbalancer.sh
diff --git a/patches/systemvm/debian/config/root/reconfigLB.sh b/systemvm/patches/debian/config/root/reconfigLB.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/reconfigLB.sh
rename to systemvm/patches/debian/config/root/reconfigLB.sh
diff --git a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ b/systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ b/systemvm/patches/debian/config/root/redundant_router/backup.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/backup.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/check_bumpup.sh b/systemvm/patches/debian/config/root/redundant_router/check_bumpup.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/check_bumpup.sh
rename to systemvm/patches/debian/config/root/redundant_router/check_bumpup.sh
diff --git a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ b/systemvm/patches/debian/config/root/redundant_router/checkrouter.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/checkrouter.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ b/systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ
rename to systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh b/systemvm/patches/debian/config/root/redundant_router/disable_pubip.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh
rename to systemvm/patches/debian/config/root/redundant_router/disable_pubip.sh
diff --git a/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ b/systemvm/patches/debian/config/root/redundant_router/enable_pubip.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/enable_pubip.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ b/systemvm/patches/debian/config/root/redundant_router/fault.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/fault.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/heartbeat.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/heartbeat.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ b/systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ
rename to systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ b/systemvm/patches/debian/config/root/redundant_router/master.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/master.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/master.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/primary-backup.sh.templ b/systemvm/patches/debian/config/root/redundant_router/primary-backup.sh.templ
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/primary-backup.sh.templ
rename to systemvm/patches/debian/config/root/redundant_router/primary-backup.sh.templ
diff --git a/patches/systemvm/debian/config/root/redundant_router/services.sh b/systemvm/patches/debian/config/root/redundant_router/services.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/redundant_router/services.sh
rename to systemvm/patches/debian/config/root/redundant_router/services.sh
diff --git a/patches/systemvm/debian/config/root/savepassword.sh b/systemvm/patches/debian/config/root/savepassword.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/savepassword.sh
rename to systemvm/patches/debian/config/root/savepassword.sh
diff --git a/patches/systemvm/debian/config/root/userdata.py b/systemvm/patches/debian/config/root/userdata.py
similarity index 100%
rename from patches/systemvm/debian/config/root/userdata.py
rename to systemvm/patches/debian/config/root/userdata.py
diff --git a/patches/systemvm/debian/config/root/userdata.sh b/systemvm/patches/debian/config/root/userdata.sh
similarity index 100%
rename from patches/systemvm/debian/config/root/userdata.sh
rename to systemvm/patches/debian/config/root/userdata.sh
diff --git a/patches/systemvm/debian/config/var/www/html/latest/.htaccess b/systemvm/patches/debian/config/var/www/html/latest/.htaccess
similarity index 100%
rename from patches/systemvm/debian/config/var/www/html/latest/.htaccess
rename to systemvm/patches/debian/config/var/www/html/latest/.htaccess
diff --git a/patches/systemvm/debian/config/var/www/html/userdata/.htaccess b/systemvm/patches/debian/config/var/www/html/userdata/.htaccess
similarity index 100%
rename from patches/systemvm/debian/config/var/www/html/userdata/.htaccess
rename to systemvm/patches/debian/config/var/www/html/userdata/.htaccess
diff --git a/patches/systemvm/debian/convert.sh b/systemvm/patches/debian/convert.sh
similarity index 100%
rename from patches/systemvm/debian/convert.sh
rename to systemvm/patches/debian/convert.sh
diff --git a/patches/systemvm/debian/qemuconvert.sh b/systemvm/patches/debian/qemuconvert.sh
similarity index 100%
rename from patches/systemvm/debian/qemuconvert.sh
rename to systemvm/patches/debian/qemuconvert.sh
diff --git a/patches/systemvm/debian/systemvm.vmx b/systemvm/patches/debian/systemvm.vmx
similarity index 100%
rename from patches/systemvm/debian/systemvm.vmx
rename to systemvm/patches/debian/systemvm.vmx
diff --git a/patches/systemvm/debian/systemvm.xml b/systemvm/patches/debian/systemvm.xml
similarity index 100%
rename from patches/systemvm/debian/systemvm.xml
rename to systemvm/patches/debian/systemvm.xml
diff --git a/patches/systemvm/debian/vhdconvert.sh b/systemvm/patches/debian/vhdconvert.sh
similarity index 100%
rename from patches/systemvm/debian/vhdconvert.sh
rename to systemvm/patches/debian/vhdconvert.sh
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf b/systemvm/patches/debian/vpn/etc/ipsec.conf
similarity index 100%
rename from patches/systemvm/debian/vpn/etc/ipsec.conf
rename to systemvm/patches/debian/vpn/etc/ipsec.conf
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
similarity index 100%
rename from patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf
rename to systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.secrets b/systemvm/patches/debian/vpn/etc/ipsec.secrets
similarity index 100%
rename from patches/systemvm/debian/vpn/etc/ipsec.secrets
rename to systemvm/patches/debian/vpn/etc/ipsec.secrets
diff --git a/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd b/systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd
similarity index 100%
rename from patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd
rename to systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd
diff --git a/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf b/systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf
similarity index 100%
rename from patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf
rename to systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf
diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh b/systemvm/patches/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
similarity index 100%
rename from patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
rename to systemvm/patches/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
similarity index 100%
rename from patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
rename to systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
diff --git a/patches/systemvm/debian/xe/xe-daemon b/systemvm/patches/debian/xe/xe-daemon
similarity index 100%
rename from patches/systemvm/debian/xe/xe-daemon
rename to systemvm/patches/debian/xe/xe-daemon
diff --git a/patches/systemvm/debian/xe/xe-linux-distribution b/systemvm/patches/debian/xe/xe-linux-distribution
similarity index 100%
rename from patches/systemvm/debian/xe/xe-linux-distribution
rename to systemvm/patches/debian/xe/xe-linux-distribution
diff --git a/patches/systemvm/debian/xe/xe-update-guest-attrs b/systemvm/patches/debian/xe/xe-update-guest-attrs
similarity index 100%
rename from patches/systemvm/debian/xe/xe-update-guest-attrs
rename to systemvm/patches/debian/xe/xe-update-guest-attrs
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
new file mode 100644
index 00000000000..5f352177362
--- /dev/null
+++ b/systemvm/pom.xml
@@ -0,0 +1,260 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloud-systemvm</artifactId>
+  <name>Apache CloudStack System VM</name>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <properties>
+    <mkisofs>mkisofs</mkisofs>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-agent</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-secondary-storage</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-console-proxy</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <finalName>systemvm</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptors>
+            <descriptor>systemvm-descriptor.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-systemvm</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <!-- here the phase you need -->
+            <phase>package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>dist</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>target</directory>
+                  <includes>
+                    <include>systemvm.zip</include>
+                  </includes>
+                </resource>
+                <resource>
+                  <directory>patches/debian/config/root/.ssh</directory>
+                  <includes>
+                    <include>authorized_keys</include>
+                  </includes>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>build-cloud-scripts</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <mkdir dir="${basedir}/target/build-patch" />
+                <mkdir dir="${basedir}/target/build-patch/usr/sbin" />
+                <copy overwrite="true" todir="${basedir}/target/build-patch">
+                  <fileset dir="${basedir}/patches/debian/config/">
+                    <include name="**/*" />
+                  </fileset>
+                  <fileset dir="${basedir}/patches/debian/vpn/">
+                    <include name="**/*" />
+                  </fileset>
+                  <fileset dir="${basedir}/patches/debian/xe/">
+                    <include name="**/*" />
+                    <exclude name="**/xe-*" />
+                    <exclude name="**/xen-*" />
+                  </fileset>
+                </copy>
+                <copy overwrite="true" todir="${basedir}/target/build-patch/usr/sbin/">
+                  <fileset dir="${basedir}/patches/debian/xe/">
+                    <include name="**/xe-*" />
+                    <include name="**/xen-*" />
+                  </fileset>
+                </copy>
+                <tar destfile="${basedir}/target/patch.tar">
+                  <tarfileset dir="${basedir}/target/build-patch/"
+                    filemode="755">
+                    <include name="**/*" />
+                    <exclude name="**/.classpath" />
+                    <exclude name="**/log**"/>
+                    <exclude name="**/logrotate.d"/>
+                    <exclude name="**/.project" />
+                    <exclude name="**/wscript_build" />
+                  </tarfileset>
+                  <tarfileset dir="${basedir}/target/build-patch/"
+                   filemode="644">
+                   <include name="**/log**"/>
+                   <include name="**/logrotate.d/**"/>
+                  </tarfileset>
+                </tar>
+                <gzip destfile="${basedir}/dist/cloud-scripts.tgz" src="${basedir}/target/patch.tar" />
+                <delete dir="${basedir}/target/build-patch" />
+                <delete file="${basedir}/target/patch.tar" />
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    <plugin>
+      <groupId>org.codehaus.mojo</groupId>
+       <artifactId>exec-maven-plugin</artifactId>
+       <version>1.2.1</version>
+       <executions>
+         <execution>
+           <phase>package</phase>
+           <goals>
+             <goal>exec</goal>
+           </goals>
+         </execution>
+       </executions>
+       <configuration>
+         <executable>${mkisofs}</executable>
+         <workingDirectory>dist</workingDirectory>
+         <arguments>
+           <argument>-quiet</argument>
+           <argument>-r</argument>
+           <argument>-o</argument>
+           <argument>systemvm.iso</argument>
+           <argument>systemvm.zip</argument>
+           <argument>cloud-scripts.tgz</argument>
+           <argument>authorized_keys</argument>
+         </arguments>
+       </configuration>
+     </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <!-- Debian will never distribute mkisofs due to licensing issues.
+         Fortunately genisoimage is a work-alike -->
+    <profile>
+      <id>genisoimage</id>
+      <activation>
+        <file>
+          <exists>/usr/bin/genisoimage</exists>
+        </file>
+      </activation>
+      <properties>
+        <mkisofs>genisoimage</mkisofs>
+      </properties>
+    </profile>
+    <profile>
+      <id>vmware</id>
+      <activation>
+        <property>
+          <name>nonoss</name>
+        </property>
+      </activation>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.cloudstack</groupId>
+                <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cloudstack</groupId>
+                <artifactId>cloud-vmware-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </profile>
+    <profile>
+      <id>quickcloud</id>
+      <build>
+      <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.cloud.agent.AgentShell</mainClass>
+          <arguments>
+            <argument>zone=1</argument>
+            <argument>pod=1</argument>
+            <argument>host=192.168.56.1</argument>
+            <argument>guid=ConsoleProxy.1</argument>
+          </arguments>
+          <systemProperties>
+            <systemProperty>
+              <key>javax.net.ssl.trustStore</key>
+              <value>certs/realhostip.keystore</value>
+              <key>log.home</key>
+              <value>${PWD}/</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      </plugins>
+    </build>
+  </profile>
+  </profiles>
+
+</project>
diff --git a/services/console-proxy/server/scripts/_run.sh b/systemvm/scripts/_run.sh
similarity index 100%
rename from services/console-proxy/server/scripts/_run.sh
rename to systemvm/scripts/_run.sh
diff --git a/services/console-proxy/server/scripts/config_auth.sh b/systemvm/scripts/config_auth.sh
similarity index 100%
rename from services/console-proxy/server/scripts/config_auth.sh
rename to systemvm/scripts/config_auth.sh
diff --git a/services/console-proxy/server/scripts/config_ssl.sh b/systemvm/scripts/config_ssl.sh
similarity index 100%
rename from services/console-proxy/server/scripts/config_ssl.sh
rename to systemvm/scripts/config_ssl.sh
diff --git a/services/console-proxy/server/scripts/consoleproxy.sh b/systemvm/scripts/consoleproxy.sh
similarity index 100%
rename from services/console-proxy/server/scripts/consoleproxy.sh
rename to systemvm/scripts/consoleproxy.sh
diff --git a/services/console-proxy/server/scripts/ipfirewall.sh b/systemvm/scripts/ipfirewall.sh
similarity index 100%
rename from services/console-proxy/server/scripts/ipfirewall.sh
rename to systemvm/scripts/ipfirewall.sh
diff --git a/services/console-proxy/server/scripts/run-proxy.sh b/systemvm/scripts/run-proxy.sh
similarity index 100%
rename from services/console-proxy/server/scripts/run-proxy.sh
rename to systemvm/scripts/run-proxy.sh
diff --git a/services/console-proxy/server/scripts/run.bat b/systemvm/scripts/run.bat
similarity index 100%
rename from services/console-proxy/server/scripts/run.bat
rename to systemvm/scripts/run.bat
diff --git a/services/console-proxy/server/scripts/run.sh b/systemvm/scripts/run.sh
similarity index 100%
rename from services/console-proxy/server/scripts/run.sh
rename to systemvm/scripts/run.sh
diff --git a/services/console-proxy/server/scripts/secstorage.sh b/systemvm/scripts/secstorage.sh
similarity index 100%
rename from services/console-proxy/server/scripts/secstorage.sh
rename to systemvm/scripts/secstorage.sh
diff --git a/services/console-proxy/server/systemvm-descriptor.xml b/systemvm/systemvm-descriptor.xml
similarity index 91%
rename from services/console-proxy/server/systemvm-descriptor.xml
rename to systemvm/systemvm-descriptor.xml
index 6c98d2d3eb0..2eb4abc2245 100644
--- a/services/console-proxy/server/systemvm-descriptor.xml
+++ b/systemvm/systemvm-descriptor.xml
@@ -31,13 +31,13 @@
   </dependencySets>
   <fileSets>
     <fileSet>
-      <directory>../../../scripts/storage/secondary/</directory>
+      <directory>../scripts/storage/secondary/</directory>
       <outputDirectory>scripts/storage/secondary</outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
     </fileSet>
     <fileSet>
-      <directory>../../secondary-storage/scripts/</directory>
+      <directory>../services/secondary-storage/scripts/</directory>
       <outputDirectory></outputDirectory>
       <directoryMode>555</directoryMode>
       <fileMode>555</fileMode>
@@ -45,12 +45,6 @@
         <include>ssvm-check.sh</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../../../scripts/storage/secondary/</directory>
-      <outputDirectory>scripts/storage/secondary</outputDirectory>
-      <directoryMode>555</directoryMode>
-      <fileMode>555</fileMode>
-    </fileSet>
     <fileSet>
       <directory>scripts</directory>
       <outputDirectory></outputDirectory>
diff --git a/services/console-proxy/server/ui/viewer-bad-sid.ftl b/systemvm/ui/viewer-bad-sid.ftl
similarity index 100%
rename from services/console-proxy/server/ui/viewer-bad-sid.ftl
rename to systemvm/ui/viewer-bad-sid.ftl
diff --git a/services/console-proxy/server/ui/viewer-connect-failed.ftl b/systemvm/ui/viewer-connect-failed.ftl
similarity index 100%
rename from services/console-proxy/server/ui/viewer-connect-failed.ftl
rename to systemvm/ui/viewer-connect-failed.ftl
diff --git a/services/console-proxy/server/ui/viewer-update.ftl b/systemvm/ui/viewer-update.ftl
similarity index 100%
rename from services/console-proxy/server/ui/viewer-update.ftl
rename to systemvm/ui/viewer-update.ftl
diff --git a/services/console-proxy/server/ui/viewer.ftl b/systemvm/ui/viewer.ftl
similarity index 100%
rename from services/console-proxy/server/ui/viewer.ftl
rename to systemvm/ui/viewer.ftl
diff --git a/services/console-proxy/server/vm-script/vmops b/systemvm/vm-script/vmops
similarity index 100%
rename from services/console-proxy/server/vm-script/vmops
rename to systemvm/vm-script/vmops