diff --git a/agent/pom.xml b/agent/pom.xml
index 36ee8916246..7a84f1febaa 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Agents</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/api/pom.xml b/api/pom.xml
index 7f780949279..db147758ff3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack API</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 45c6279edaf..321f348f4c4 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -24,9 +24,8 @@
   <name>Apache CloudStack AWS API Bridge</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 5abf1902127..052bd5a48ce 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Console Proxy</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 306cc1102f4..510cb04105e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Core</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index a0f18b1a99b..13375144534 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -20,14 +20,14 @@
          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>
   <parent>
-    <artifactId>cloud-parent</artifactId>
     <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>xapi</artifactId>
   <version>5.6.100-1-SNAPSHOT</version>
-  <name>XenSource XAPI</name>
+  <name>Apache XenSource XAPI</name>
   <description>XenSource XAPI Java Bindings</description>
   <dependencies>
     <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
deleted file mode 100644
index 1cf7b667b36..00000000000
--- a/parent/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--
-  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/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloudstack</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cloud-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Apache CloudStack Parent</name>
-  <description>Apache CloudStack Parent POM</description>
-  <properties>
-    <cs.log4j.version>1.2.16</cs.log4j.version>
-    <cs.log4j.extras.version>1.1</cs.log4j.extras.version>
-    <cs.cglib.version>2.2.2</cs.cglib.version>
-    <cs.dbcp.version>1.4</cs.dbcp.version>
-    <cs.pool.version>1.6</cs.pool.version>
-    <cs.codec.version>1.6</cs.codec.version>
-    <cs.configuration.version>1.8</cs.configuration.version>
-    <cs.ejb.version>3.0</cs.ejb.version>
-    <cs.junit.version>4.10</cs.junit.version>
-    <cs.bcprov.version>1.46</cs.bcprov.version>
-    <cs.jsch.version>0.1.42</cs.jsch.version>
-    <cs.jpa.version>1.0.0.Final</cs.jpa.version>
-    <cs.jasypt.version>1.9.0</cs.jasypt.version>
-    <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
-    <cs.ehcache.version>1.5.0</cs.ehcache.version>
-    <cs.gson.version>1.7.1</cs.gson.version>
-    <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
-    <cs.httpclient.version>3.1</cs.httpclient.version>
-    <cs.httpcore.version>4.0</cs.httpcore.version>
-    <cs.mysql.version>5.1.12</cs.mysql.version>
-    <cs.xstream.version>1.3.1</cs.xstream.version>
-    <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
-    <cs.mail.version>1.4</cs.mail.version>
-    <cs.axis.version>1.4</cs.axis.version>
-    <cs.axis2.version>1.5.1</cs.axis2.version>
-    <cs.axiom.version>1.2.8</cs.axiom.version>
-    <cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
-    <cs.neethi.version>2.0.4</cs.neethi.version>
-    <cs.servlet.version>2.4</cs.servlet.version>
-    <skipTests>true</skipTests>
-  </properties>
-  <build>
-    <defaultGoal>install</defaultGoal>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${cs.junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index 2a288a1836d..2cbec4c912b 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Concentrated Pod Deployment Planner</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index 6321e94233c..7cf49720e39 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Dispersing Deployment Planner</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml
index 6344f11cb58..ce690e5ed04 100644
--- a/plugins/file-systems/netapp/pom.xml
+++ b/plugins/file-systems/netapp/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - NetApp File System</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 161e5db91ff..bfcdc12e534 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Host Allocator Random</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 8d28b05dc9d..317ba1729ac 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor KVM</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 93783d407c2..250a5d3caf5 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Hypervisor OracleVM</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 00748ca7e9f..b25b9010986 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor VMware</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index f9376abdf57..c94a8b754c4 100644
--- a/plugins/hypervisors/xen/pom.xml
+++ b/plugins/hypervisors/xen/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor Xen</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index d48669c3235..2dfa9808198 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Network Elastic Load Balancer</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 2a5058f0bb4..70a1ce199e9 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - F5</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index 7d984e44b38..b0eb4bd633b 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Juniper SRX</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/network-elements/midokura-midonet/pom.xml b/plugins/network-elements/midokura-midonet/pom.xml
index f41cd5ed3b7..8f3078ea032 100644
--- a/plugins/network-elements/midokura-midonet/pom.xml
+++ b/plugins/network-elements/midokura-midonet/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Midokura Midonet</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index e504009ba42..c863617d035 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Network Netscaler</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 0e4ded7f498..2c08c9b6adb 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Network Nicira NVP</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index c93262f7f86..7702f4fda78 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Open vSwitch</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml
deleted file mode 100644
index 2553d2c618a..00000000000
--- a/plugins/parent/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  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-plugin-parent</artifactId>
-  <name>Apache CloudStack Plugin POM</name>
-  <packaging>pom</packaging>
-  <parent>
-    <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-  </build>
-</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 81eb20dd132..b2eabd6613b 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,16 +24,14 @@
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.apache.cloudstack</groupId>
-		<artifactId>cloud-parent</artifactId>
+		<artifactId>cloudstack</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
 		<sourceDirectory>src</sourceDirectory>
 	</build>
 	<modules>
-		<module>parent</module>
 		<module>deployment-planners/user-concentrated-pod</module>
 		<module>deployment-planners/user-dispersing</module>
 		<module>file-systems/netapp</module>
@@ -54,4 +52,13 @@
 		<module>user-authenticators/md5</module>
 		<module>user-authenticators/plain-text</module>
 	</modules>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index 3242dafc524..15c927d6048 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Storage Allocator Random</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index b07cd7e3a2e..fe9ffa021d9 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Authenticator LDAP</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index 8a679e0c8db..c1e07aa69d7 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Authenticator MD5</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 228d7baca7f..ed129767be9 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Authenticator Plain Text</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 408e03d100c..de49d2ec198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,38 @@
   <properties>
     <cs.jdk.version>1.6</cs.jdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <cs.log4j.version>1.2.16</cs.log4j.version>
+    <cs.log4j.extras.version>1.1</cs.log4j.extras.version>
+    <cs.cglib.version>2.2.2</cs.cglib.version>
+    <cs.dbcp.version>1.4</cs.dbcp.version>
+    <cs.pool.version>1.6</cs.pool.version>
+    <cs.codec.version>1.6</cs.codec.version>
+    <cs.configuration.version>1.8</cs.configuration.version>
+    <cs.ejb.version>3.0</cs.ejb.version>
+    <cs.junit.version>4.10</cs.junit.version>
+    <cs.bcprov.version>1.46</cs.bcprov.version>
+    <cs.jsch.version>0.1.42</cs.jsch.version>
+    <cs.jpa.version>1.0.0.Final</cs.jpa.version>
+    <cs.jasypt.version>1.9.0</cs.jasypt.version>
+    <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
+    <cs.ehcache.version>1.5.0</cs.ehcache.version>
+    <cs.gson.version>1.7.1</cs.gson.version>
+    <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
+    <cs.httpclient.version>3.1</cs.httpclient.version>
+    <cs.httpcore.version>4.0</cs.httpcore.version>
+    <cs.mysql.version>5.1.12</cs.mysql.version>
+    <cs.xstream.version>1.3.1</cs.xstream.version>
+    <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
+    <cs.mail.version>1.4</cs.mail.version>
+    <cs.axis.version>1.4</cs.axis.version>
+    <cs.axis2.version>1.5.1</cs.axis2.version>
+    <cs.axiom.version>1.2.8</cs.axiom.version>
+    <cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
+    <cs.neethi.version>2.0.4</cs.neethi.version>
+    <cs.servlet.version>2.4</cs.servlet.version>
+    <skipTests>true</skipTests>
+
   </properties>
 
   <distributionManagement>
@@ -109,7 +141,6 @@
   </organization>
 
   <modules>
-    <module>parent</module>
     <module>api</module>
     <module>agent</module>
     <module>console-proxy</module>
@@ -123,6 +154,15 @@
     <module>awsapi</module>
   </modules>
 
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${cs.junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <defaultGoal>install</defaultGoal>
     <pluginManagement>
diff --git a/server/pom.xml b/server/pom.xml
index db89a5ceb50..f8d7985d7da 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Server</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/usage/pom.xml b/usage/pom.xml
index 142bc4fb140..92e5e728f1a 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Usage Server</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index a6db5b2446e..48d597504bf 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Utils</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 0dc6c5923da..1dabe83841e 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack VMware Base</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>