diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android.hbs
deleted file mode 100644
index 6cef790b..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{layout "fluid"}}
-{{#zone  "title"}}
-    WSO2 IoT Server | Android
-{{/zone}}
-{{#zone "body"}}
-	{{unit "appbar" link="dashboard" enableBack="true" title="Android"}}
-    {{unit "android"}}
-{{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
deleted file mode 100644
index 7bc67479..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
+++ /dev/null
@@ -1,87 +0,0 @@
-{{#zone "main"}}
-<div class="container container-bg  white-bg">
-        <div class=" margin-top-double">
-            <div class="row row padding-top-double padding-bottom-double margin-bottom-double">
-                <div class="col-lg-12  margin-top-double">
-                    <h1 class="grey ">Android</h1>
-                    <hr>
-                    <p  class="margin-bottom-double light-grey ">Connect your Android
-                    to the WSO2 IoT server. </p>
-                </div>
-                <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-                <img src="{{self.publicURL}}/images/android.png" class="img-responsive">
-            </div>
-                <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-                    <h2 class="uppercase">Ingredients</h2>
-                    <hr>
-                    <p class="grey margin-top">Hardware Requirements </p>
-                    <br><br>
-                                <span class="fw-stack fw-lg margin-right">
-                                    <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                                </span>Arduino Uno<br><br>
-                                <span class="fw-stack fw-lg margin-right">
-                                    <i class="fw fw-ring fw-stack-2x"> </i>
-                                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                                </span>Arduino Ethernet / WiFi Shield
-								<br /><br />
-								<form method="POST" class="float-left margin-right"
-									action="{{sketchPath}}">
-										<input type="hidden" name="deviceType" value="sensebot" />
-                                        <input type="hidden" name="sketchType" value="sensebot_wifi" />
-										<button class="wr-btn" type="submit">Create Sketch for
-										Wifi
-										</button>
-									</form>
-                                <form method="POST" class="form-login-box float-left"
-                                action="{{sketchPath}}">
-									<input type="hidden" name="deviceType" value="sensebot" />
-                                    <input type="hidden" name="sketchType" value="sensebot" />
-									<button class="wr-btn margin-right" type="submit">Create
-									Sketch
-									for Ethernet</button>
-								</form>
-                                <br/>
-                </div>
-                <div class ="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-                    <h2 class="uppercase">Prepare</h2><hr>
-                    <p class="grey margin-top">Get your device ready  </p>
-                         <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                             <span class="circle">01  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                        </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom">
-                        <span class="circle">02  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                    </div>
-                    <div class="margin-doubles padding-top-double margin-bottom-double light-grey  margin-left-double margin-bottom">
-                        <span class="circle">03  </span> <span class="padding-left"> Mount the Ethernet / Wifi shield on the Arduino Uno device.</span>
-                        </div>
-                </div>
-            </div>
-            <div class="row row padding-top-double padding-bottom-double margin-bottom-double  ">
-                <div class="col-lg-12  margin-top-double">
-                    <h2 class="uppercase ">Connect (Quickstart)</h2>
-                    <hr>
-                    <p  class="margin-bottom-double light-grey ">Internet of Things Foundation Quickstart connection  </p>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">01  </span> <span class="padding-left">Use the following command to download the installer from GitHub:</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">02  </span> <span class="padding-left">Download the Sketch installer from the Arduino website <a href="http://arduino.cc/en/Main/Software">http://arduino.cc/en/Main/Software</a></span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">03  </span> <span class="padding-left"> Install the Sketch program</span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">04  </span> <span class="padding-left">Use the Sketch program to open the samples code: <a href="http://tinyurl.com/EUHackathonRobot">http://tinyurl.com/EUHackathonRobot</a> </span><br>
-                    </div>
-                    <div class="margin-doubles padding-top-double light-grey  margin-left-double margin-bottom ">
-                        <span class="circle">05  </span> <span class="padding-left">View the lower part of the Sketch pad window to check that the COM connection is shown as active</span><br>
-                    </div>
-                </div>
-            </div>
-        </div>
-{{/zone}}
-{{#zone  "topCss"}}
-    <link href="{{self.publicURL}}/css/fontwso2.css" rel="stylesheet">
-    <link href="{{self.publicURL}}/css/fontwso2-extend.css" rel="stylesheet">
-{{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js
deleted file mode 100644
index dae1a137..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js
+++ /dev/null
@@ -1,4 +0,0 @@
-function onRequest(context){
-    context.sketchPath = "api/device/sketch/download";
-    return context;
-}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.json
deleted file mode 100644
index 3dbff381..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "predicate": "false"
-}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android-thumb.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android-thumb.png
deleted file mode 100644
index d38a8d75..00000000
Binary files a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android-thumb.png and /dev/null differ
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android.png
deleted file mode 100644
index d38a8d75..00000000
Binary files a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android.png and /dev/null differ
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
deleted file mode 100644
index e9476fe3..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "title" : "Android",
-  "description":"Connect Your Android mobile into the WSO2 IoT Server"
-}
\ No newline at end of file
diff --git a/modules/distribution/src/samples/android_sense/build.xml b/modules/distribution/src/samples/android_sense/build.xml
index 708bd465..83fb5bda 100644
--- a/modules/distribution/src/samples/android_sense/build.xml
+++ b/modules/distribution/src/samples/android_sense/build.xml
@@ -42,6 +42,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -50,6 +51,7 @@
     <target name="clean">
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android_sense.hbs b/modules/distribution/src/samples/android_sense/page/android_sense.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/android_sense.hbs
rename to modules/distribution/src/samples/android_sense/page/android_sense.hbs
diff --git a/modules/distribution/src/samples/arduino/build.xml b/modules/distribution/src/samples/arduino/build.xml
index 2c255ee5..08cbf3a0 100644
--- a/modules/distribution/src/samples/arduino/build.xml
+++ b/modules/distribution/src/samples/arduino/build.xml
@@ -41,6 +41,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -49,6 +50,7 @@
     <target name="clean">
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/arduino.hbs b/modules/distribution/src/samples/arduino/page/arduino.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/arduino.hbs
rename to modules/distribution/src/samples/arduino/page/arduino.hbs
diff --git a/modules/distribution/src/samples/digital_display/build.xml b/modules/distribution/src/samples/digital_display/build.xml
index 0b9ad467..5060e4dd 100644
--- a/modules/distribution/src/samples/digital_display/build.xml
+++ b/modules/distribution/src/samples/digital_display/build.xml
@@ -41,6 +41,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -49,7 +50,11 @@
     <target name="clean">
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/digital_display.hbs b/modules/distribution/src/samples/digital_display/page/digital_display.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/digital_display.hbs
rename to modules/distribution/src/samples/digital_display/page/digital_display.hbs
diff --git a/modules/distribution/src/samples/firealarm/build.xml b/modules/distribution/src/samples/firealarm/build.xml
index c41c3f3c..26ff0c47 100644
--- a/modules/distribution/src/samples/firealarm/build.xml
+++ b/modules/distribution/src/samples/firealarm/build.xml
@@ -42,6 +42,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -50,6 +51,7 @@
     <target name="clean">
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/firealarm.hbs b/modules/distribution/src/samples/firealarm/page/firealarm.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/firealarm.hbs
rename to modules/distribution/src/samples/firealarm/page/firealarm.hbs
diff --git a/modules/distribution/src/samples/raspberrypi/build.xml b/modules/distribution/src/samples/raspberrypi/build.xml
index f6f4c04f..59efd79f 100644
--- a/modules/distribution/src/samples/raspberrypi/build.xml
+++ b/modules/distribution/src/samples/raspberrypi/build.xml
@@ -41,6 +41,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -49,6 +50,7 @@
     <target name="clean">
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs b/modules/distribution/src/samples/raspberrypi/page/raspberrypi.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs
rename to modules/distribution/src/samples/raspberrypi/page/raspberrypi.hbs
diff --git a/modules/distribution/src/samples/sensebot/build.xml b/modules/distribution/src/samples/sensebot/build.xml
index eb3b570b..7c3f3827 100644
--- a/modules/distribution/src/samples/sensebot/build.xml
+++ b/modules/distribution/src/samples/sensebot/build.xml
@@ -43,6 +43,7 @@
         </copy>
         <copy file="src/${package}.service.impl/target/${sample_type}.war" toDir="${target.webapp.dir}" overwrite="yes"/>
         <copy file="src/${package}.plugin.impl/target/${package}.plugin.impl-${target.version}.jar" toDir="${target.dropins.dir}" overwrite="yes"/>
+        <copy file="page/${sample_type}.hbs" toDir="${target.page.dir}" overwrite="yes"/>
         <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
@@ -52,6 +53,7 @@
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.sketch.dir}/${sample_type}_wifi"/>
+        <delete file="${target.page.dir}/${sample_type}.hbs"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
         <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
             <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs b/modules/distribution/src/samples/sensebot/page/sensebot.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs
rename to modules/distribution/src/samples/sensebot/page/sensebot.hbs