diff --git a/components/pom.xml b/components/pom.xml
deleted file mode 100644
index f615802ad..000000000
--- a/components/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>wso2cdm-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdmserver</groupId>
-    <artifactId>wso2cdmserver-components</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Connected Device Manager (CDM) - Parent</name>
-
-    <modules>
-	<module>device-mgt</module>
-        <module>policy-mgt</module>
-    </modules>
-</project>
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644
index 0507dbd50..000000000
--- a/features/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>wso2cdm-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.cdmserver</groupId>
-    <artifactId>wso2cdmserver-features</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Connected Device Manager (CDM) - Parent</name>
-
-    <modules>
-	<module>device-mgt</module>
-    </modules>
-</project>
diff --git a/pom.xml b/pom.xml
index abe1d4887..c1668c60a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,9 @@
     </parent>
 
     <modules>
-        <module>components</module>
-        <module>features</module>
+        <module>components/device-mgt</module>
+        <module>components/policy-mgt</module>
+        <module>features/device-mgt</module>
         <module>product</module>
     </modules>
 
diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml
index c326a514e..ba6de3b91 100644
--- a/product/modules/distribution/pom.xml
+++ b/product/modules/distribution/pom.xml
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-parent</artifactId>
+        <artifactId>wso2cdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/product/modules/integration/pom.xml b/product/modules/integration/pom.xml
index b333ca4e9..fb2ef0f59 100644
--- a/product/modules/integration/pom.xml
+++ b/product/modules/integration/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-parent</artifactId>
+        <artifactId>wso2cdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 26174b9d0..2fece93e2 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.cdmserver</groupId>
-        <artifactId>wso2cdmserver-parent</artifactId>
+        <artifactId>wso2cdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/product/pom.xml b/product/pom.xml
index f83bde492..ecd5db07f 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -34,7 +34,7 @@
     <name>WSO2 Connected Device Manager (CDM) - Parent</name>
 
     <modules>
-	<module>modules/p2-profile-gen</module>
+        <module>modules/p2-profile-gen</module>
         <module>modules/distribution</module>
         <module>modules/integration</module>
     </modules>