diff --git a/modules/distribution/src/samples/android_sense/build.xml b/modules/distribution/src/samples/android_sense/build.xml
new file mode 100644
index 00000000..86b5be1a
--- /dev/null
+++ b/modules/distribution/src/samples/android_sense/build.xml
@@ -0,0 +1,36 @@
+<project name="Arduino" basedir="." default="deploy">
+
+    <import file="../common.xml"/>
+
+    <property name="sample_type" value="android_sense"/>
+    <property name="data_source" value="AndroidSenseDM_DB"/>
+
+    <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
+            <fileset dir="sketch"/>
+        </copy>
+        <copy toDir="${target.unit.dir}/${sample_type}">
+            <fileset dir="units"/>
+        </copy>
+    </target>
+
+    <target name="clean">
+        <delete file="${target.db.dir}/${data_source}.h2.db"/>
+        <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/android_sense/sketch/android_sense.apk b/modules/distribution/src/samples/android_sense/sketch/android_sense.apk
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/distribution/src/samples/android_sense/sketch/sketch.properties b/modules/distribution/src/samples/android_sense/sketch/sketch.properties
new file mode 100644
index 00000000..5db8a62d
--- /dev/null
+++ b/modules/distribution/src/samples/android_sense/sketch/sketch.properties
@@ -0,0 +1,2 @@
+templates=android_sense.apk
+zipfilename=android_sense.zip
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs b/modules/distribution/src/samples/android_sense/units/android_sense.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
rename to modules/distribution/src/samples/android_sense/units/android_sense.hbs
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js b/modules/distribution/src/samples/android_sense/units/android_sense.js
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js
rename to modules/distribution/src/samples/android_sense/units/android_sense.js
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.json b/modules/distribution/src/samples/android_sense/units/android_sense.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.json
rename to modules/distribution/src/samples/android_sense/units/android_sense.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense-thumb.png b/modules/distribution/src/samples/android_sense/units/public/images/android_sense-thumb.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense-thumb.png
rename to modules/distribution/src/samples/android_sense/units/public/images/android_sense-thumb.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense.png b/modules/distribution/src/samples/android_sense/units/public/images/android_sense.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense.png
rename to modules/distribution/src/samples/android_sense/units/public/images/android_sense.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/store.json b/modules/distribution/src/samples/android_sense/units/public/store.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/store.json
rename to modules/distribution/src/samples/android_sense/units/public/store.json
diff --git a/modules/distribution/src/samples/arduino/build.xml b/modules/distribution/src/samples/arduino/build.xml
index 17a081cb..6c63b72d 100644
--- a/modules/distribution/src/samples/arduino/build.xml
+++ b/modules/distribution/src/samples/arduino/build.xml
@@ -3,22 +3,34 @@
     <import file="../common.xml"/>
 
     <property name="sample_type" value="arduino"/>
-    <property name="data_source" value="ArduinoDM_DB.h2.db"/>
+    <property name="data_source" value="ArduinoDM_DB"/>
 
-    <target name="deploy" depends="clean">
-        <copy file="database/${data_source}" toDir="${database_dir}" overwrite="yes"/>
-        <copy toDir="${sketches_dir}/${sample_type}">
+    <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
-        <copy toDir="${units_dir}/${sample_type}">
+        <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
     </target>
 
     <target name="clean">
-        <delete file="${database_dir}/${data_source}"/>
-        <delete dir="${sketches_dir}/${sample_type}"/>
-        <delete dir="${units_dir}/${sample_type}"/>
+        <delete file="${target.db.dir}/${data_source}.h2.db"/>
+        <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/common.xml b/modules/distribution/src/samples/common.xml
index ab8cb74f..73d852ac 100644
--- a/modules/distribution/src/samples/common.xml
+++ b/modules/distribution/src/samples/common.xml
@@ -1,5 +1,10 @@
 <project>
-    <property name="database_dir" value="../../repository/database"/>
-    <property name="sketches_dir" value="../../repository/resources/sketches"/>
-    <property name="units_dir" value="../../repository/deployment/server/jaggeryapps/iotserver/units"/>
+    <property name="lib.dir" value="../../repository/components/plugins"/>
+    <property name="target.db.dir" value="../../repository/database"/>
+    <property name="target.sketch.dir" value="../../repository/resources/sketches"/>
+    <property name="target.unit.dir" value="../../repository/deployment/server/jaggeryapps/iotserver/units"/>
+    <property name="db.username" value="wso2carbon"/>
+    <property name="db.password" value="wso2carbon"/>
+    <property name="db.dir" value="database"/>
+    <property name="db.type" value="h2"/>
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/digital_display/build.xml b/modules/distribution/src/samples/digital_display/build.xml
index 1e380f83..99644e9a 100644
--- a/modules/distribution/src/samples/digital_display/build.xml
+++ b/modules/distribution/src/samples/digital_display/build.xml
@@ -3,22 +3,34 @@
     <import file="../common.xml"/>
 
     <property name="sample_type" value="digital_display"/>
-    <property name="data_source" value="DigitalDisplayDM_DB.h2.db"/>
+    <property name="data_source" value="DigitalDisplayDM_DB"/>
 
-    <target name="deploy" depends="clean">
-        <copy file="database/${data_source}" toDir="${database_dir}" overwrite="yes"/>
-        <copy toDir="${sketches_dir}/${sample_type}">
+    <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
-        <copy toDir="${units_dir}/${sample_type}">
+        <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
     </target>
 
     <target name="clean">
-        <delete file="${database_dir}/${data_source}"/>
-        <delete dir="${sketches_dir}/${sample_type}"/>
-        <delete dir="${units_dir}/${sample_type}"/>
+        <delete file="${target.db.dir}/${data_source}.h2.db"/>
+        <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/firealarm/build.xml b/modules/distribution/src/samples/firealarm/build.xml
index e70c34b5..f5bfe333 100644
--- a/modules/distribution/src/samples/firealarm/build.xml
+++ b/modules/distribution/src/samples/firealarm/build.xml
@@ -3,22 +3,34 @@
     <import file="../common.xml"/>
 
     <property name="sample_type" value="firealarm"/>
-    <property name="data_source" value="FireAlarmDM_DB.h2.db"/>
+    <property name="data_source" value="FireAlarmDM_DB"/>
 
-    <target name="deploy" depends="clean">
-        <copy file="database/${data_source}" toDir="${database_dir}" overwrite="yes"/>
-        <copy toDir="${sketches_dir}/${sample_type}">
+    <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
-        <copy toDir="${units_dir}/${sample_type}">
+        <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
     </target>
 
     <target name="clean">
-        <delete file="${database_dir}/${data_source}"/>
-        <delete dir="${sketches_dir}/${sample_type}"/>
-        <delete dir="${units_dir}/${sample_type}"/>
+        <delete file="${target.db.dir}/${data_source}.h2.db"/>
+        <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/build.xml b/modules/distribution/src/samples/raspberrypi/build.xml
new file mode 100644
index 00000000..a4f3253b
--- /dev/null
+++ b/modules/distribution/src/samples/raspberrypi/build.xml
@@ -0,0 +1,36 @@
+<project name="Arduino" basedir="." default="deploy">
+
+    <import file="../common.xml"/>
+
+    <property name="sample_type" value="raspberrypi"/>
+    <property name="data_source" value="RaspberrypiDM_DB"/>
+
+    <target name="create-db" depends="clean">
+        <mkdir dir="${db.dir}"/>
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
+            <fileset dir="sketch"/>
+        </copy>
+        <copy toDir="${target.unit.dir}/${sample_type}">
+            <fileset dir="units"/>
+        </copy>
+    </target>
+
+    <target name="clean">
+        <delete file="${target.db.dir}/${data_source}.h2.db"/>
+        <delete dir="${target.sketch.dir}/${sample_type}"/>
+        <delete dir="${target.unit.dir}/${sample_type}"/>
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/sketch/raspberrypi.deb b/modules/distribution/src/samples/raspberrypi/sketch/raspberrypi.deb
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/distribution/src/samples/raspberrypi/sketch/sketch.properties b/modules/distribution/src/samples/raspberrypi/sketch/sketch.properties
new file mode 100644
index 00000000..cf22ef63
--- /dev/null
+++ b/modules/distribution/src/samples/raspberrypi/sketch/sketch.properties
@@ -0,0 +1,2 @@
+templates=raspberrypi.deb
+zipfilename=raspberrypi.zip
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/images/raspberrypi-thumb.png b/modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi-thumb.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/images/raspberrypi-thumb.png
rename to modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi-thumb.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/images/raspberrypi.png b/modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/images/raspberrypi.png
rename to modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/store.json b/modules/distribution/src/samples/raspberrypi/units/public/store.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/public/store.json
rename to modules/distribution/src/samples/raspberrypi/units/public/store.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs
rename to modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.js b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.js
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.js
rename to modules/distribution/src/samples/raspberrypi/units/raspberrypi.js
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.json b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.json
rename to modules/distribution/src/samples/raspberrypi/units/raspberrypi.json
diff --git a/modules/distribution/src/samples/sensebot/build.xml b/modules/distribution/src/samples/sensebot/build.xml
index 06a5cc64..b771e1da 100644
--- a/modules/distribution/src/samples/sensebot/build.xml
+++ b/modules/distribution/src/samples/sensebot/build.xml
@@ -5,24 +5,35 @@
     <property name="sample_type" value="sensebot"/>
     <property name="data_source" value="SensebotDM_DB.h2.db"/>
 
-    <target name="deploy" depends="clean">
-        <copy file="database/${data_source}" toDir="${database_dir}" overwrite="yes"/>
-        <copy toDir="${sketches_dir}/${sample_type}">
+    <target name="create-db" depends="clean">
+        <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
+
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+            <classpath>
+                <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
+            </classpath>
+            <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
+        </sql>
+    </target>
+
+    <target name="deploy" depends="create-db">
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+        <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
-        <copy toDir="${sketches_dir}/${sample_type}_wifi">
+        <copy toDir="${target.sketch.dir}/${sample_type}_wifi">
             <fileset dir="sketch_wifi"/>
         </copy>
-        <copy toDir="${units_dir}/${sample_type}">
+        <copy toDir="${target.unit.dir}/${sample_type}">
             <fileset dir="units"/>
         </copy>
     </target>
 
     <target name="clean">
-        <delete file="${database_dir}/${data_source}"/>
-        <delete dir="${sketches_dir}/${sample_type}"/>
-        <delete dir="${sketches_dir}/${sample_type}_wifi"/>
-        <delete dir="${units_dir}/${sample_type}"/>
+        <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 dir="${target.unit.dir}/${sample_type}"/>
     </target>
 
 </project>
\ No newline at end of file