diff --git a/components/pom.xml b/components/pom.xml
new file mode 100644
index 000000000..f615802ad
--- /dev/null
+++ b/components/pom.xml
@@ -0,0 +1,40 @@
+<?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
new file mode 100644
index 000000000..0507dbd50
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,39 @@
+<?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 73843cab1..f3662c170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,12 +37,9 @@
     </parent>
 
     <modules>
-        <module>components/device-mgt</module>
-        <module>components/policy-mgt</module>
-        <module>features/device-mgt</module>
-        <module>product/modules/p2-profile-gen</module>
-        <module>product/modules/distribution</module>
-        <module>product/modules/integration</module>
+        <module>components</module>
+        <module>features</module>
+        <module>product</module>
     </modules>
 
 
@@ -202,4 +199,4 @@
     </properties>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/product/pom.xml b/product/pom.xml
index 505f25828..f83bde492 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -29,7 +29,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.cdmserver</groupId>
-    <artifactId>wso2cdmserver-parent</artifactId>
+    <artifactId>wso2cdmserver-product</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Connected Device Manager (CDM) - Parent</name>
+
+    <modules>
+	<module>modules/p2-profile-gen</module>
+        <module>modules/distribution</module>
+        <module>modules/integration</module>
+    </modules>
 </project>