diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
index e0b935e4..8ac9c4bd 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
index e2a19220..b09a2a52 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-        <artifactId>iot-server-samples</artifactId>
+        <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense</artifactId>
         <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
         <version>${carbon.iot.device.mgt.version}</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/android_sense/src/pom.xml b/modules/distribution/src/samples/android_sense/src/pom.xml
new file mode 100644
index 00000000..5d2c7708
--- /dev/null
+++ b/modules/distribution/src/samples/android_sense/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Android Sense Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - Android Sense Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
index 9a074d12..986a27bd 100644
--- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
index 4fdf5f89..7bbdf81a 100644
--- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
+++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-    <artifactId>iot-server-samples</artifactId>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino</artifactId>
     <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
     <version>${carbon.iot.device.mgt.version}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/arduino/src/pom.xml b/modules/distribution/src/samples/arduino/src/pom.xml
new file mode 100644
index 00000000..cb232df5
--- /dev/null
+++ b/modules/distribution/src/samples/arduino/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Arduino Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - Arduino Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
index 6e61e324..66f5e74e 100644
--- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
index 13166fb6..5e401386 100644
--- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
+++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-        <artifactId>iot-server-samples</artifactId>
+        <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay</artifactId>
         <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
         <version>${carbon.iot.device.mgt.version}</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/digital_display/src/pom.xml b/modules/distribution/src/samples/digital_display/src/pom.xml
new file mode 100644
index 00000000..fa78cc3e
--- /dev/null
+++ b/modules/distribution/src/samples/digital_display/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Digitaldisplay Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - Digital display Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
index 24ed5ebb..765e8edf 100644
--- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index d0644de2..7a820177 100644
--- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-        <artifactId>iot-server-samples</artifactId>
+        <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm</artifactId>
         <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
         <version>${carbon.iot.device.mgt.version}</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/firealarm/src/pom.xml b/modules/distribution/src/samples/firealarm/src/pom.xml
new file mode 100644
index 00000000..0709a76e
--- /dev/null
+++ b/modules/distribution/src/samples/firealarm/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Firealarm Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - IoT Server Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/pom.xml b/modules/distribution/src/samples/pom.xml
index a92cf1cf..d3e23151 100644
--- a/modules/distribution/src/samples/pom.xml
+++ b/modules/distribution/src/samples/pom.xml
@@ -36,18 +36,12 @@
     </parent>
 
     <modules>
-        <module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</module>
-        <module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</module>
-        <module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</module>
-        <module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</module>
-        <module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</module>
-        <module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</module>
-        <module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</module>
-        <module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</module>
-        <module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</module>
-        <module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</module>
-        <module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</module>
-        <module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</module>
+        <module>firealarm/src</module>
+        <module>android_sense/src</module>
+        <module>arduino/src</module>
+        <module>digital_display/src</module>
+        <module>raspberrypi/src</module>
+        <module>sensebot/src</module>
     </modules>
 
     <dependencyManagement>
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
index 16d34b9d..f5cfb8b4 100644
--- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
index d0f8b1ae..517118ef 100644
--- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
+++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-        <artifactId>iot-server-samples</artifactId>
+        <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi</artifactId>
         <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
         <version>${carbon.iot.device.mgt.version}</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/raspberrypi/src/pom.xml b/modules/distribution/src/samples/raspberrypi/src/pom.xml
new file mode 100644
index 00000000..56eac3ee
--- /dev/null
+++ b/modules/distribution/src/samples/raspberrypi/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Raspberry pi Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - Raspberry pi Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
index db19e39b..55aa212c 100644
--- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
@@ -13,10 +13,10 @@
 <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>
-		<artifactId>iot-server-samples</artifactId>
+		<artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot</artifactId>
 		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 		<version>${carbon.iot.device.mgt.version}</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
index 5d51dfbf..ea24e700 100644
--- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
+++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
@@ -3,10 +3,10 @@
          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>
-        <artifactId>iot-server-samples</artifactId>
+        <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot</artifactId>
         <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
         <version>${carbon.iot.device.mgt.version}</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/distribution/src/samples/sensebot/src/pom.xml b/modules/distribution/src/samples/sensebot/src/pom.xml
new file mode 100644
index 00000000..e98ec6e9
--- /dev/null
+++ b/modules/distribution/src/samples/sensebot/src/pom.xml
@@ -0,0 +1,23 @@
+<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>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot</artifactId>
+	<packaging>pom</packaging>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<name>WSO2 Carbon - Sensebot Sample</name>
+	<url>http://wso2.org</url>
+	<description>WSO2 Carbon - Sensebot Sample</description>
+
+	<modules>
+		<module>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</module>
+		<module>org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</module>
+	</modules>
+
+</project>
\ No newline at end of file