diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 303ac1cc..fb448067 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -755,34 +755,6 @@
                 <include>**/*</include>
             </includes>
         </fileSet>
-
-        <!-- Files required to mobile-qsg -->
-        <fileSet>
-            <directory>../scripts/mobile-qsg/resources/webapps</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../scripts/mobile-qsg/resources/dropins</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/components/dropins
-            </outputDirectory>
-        </fileSet>
-        <!-- Above two fileset blocks can be removed when appm integration is implemented -->
-
-        <fileSet>
-            <directory>../scripts/mobile-qsg/resources/script</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/samples/mobile-qsg
-            </outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <!-- Files required to mobile-qsg -->
-
     </fileSets>
 
     <dependencySets>
@@ -1469,12 +1441,5 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
-        <!-- Copying mobile-qsg jar  -->
-        <file>
-            <source>../scripts/mobile-qsg/target/mobile-qsg.jar</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/samples/mobile-qsg
-            </outputDirectory>
-        </file>
     </files>
 </assembly>
diff --git a/modules/core/scripts/mobile-qsg/resources/Readme.txt b/modules/core/scripts/mobile-qsg/resources/Readme.txt
index 62a8ca47..36cf44c3 100644
--- a/modules/core/scripts/mobile-qsg/resources/Readme.txt
+++ b/modules/core/scripts/mobile-qsg/resources/Readme.txt
@@ -1,9 +1,10 @@
-    IoTs 3.1.0 QSG Setup guide
+    IoTs 3.0.0 QSG Setup guide
 
-1. Start the WSO2 IoTS server
-2. Navigate to <IoTS_HOME>/core/samples/mobile-qsg/ directory using the terminal.
-3. Once server is started execute the mobile-qsg.sh script
-4. Then login to the https://<your-server>:9443/devicemgt/ and use the username,password as alex alex@IoTS,
-Note that for this sample we have configured above user from the script. If you want to run this script again you have to login as admin and remove the user alex, chris and role iotMobileUser from the IoT Server.
+1. Navigate to this folder using the terminal, Note that this (Readme.txt) flie should be located under <IoTS_HOME>/core/samples/mobile-qsg/ directory.
+2. Stop the WSO2 IoTS if already runing
+3. Then execute the copy-files.sh script
+4. Start the WSO2 IoTS server
+5. Once server is started execute the mobile-qsg.sh script
+6. Then login to the https://<your-server>:9443/devicemgt/ and use the username,password as alex alex@IoTS, Note that for this sample we have configured above user from the script. If you want to run this script again you have to login as admin and remove the user alex, chris and role iotMobileUser from the IoT Server.
 
 
diff --git a/modules/core/scripts/mobile-qsg/resources/copy-files.sh b/modules/core/scripts/mobile-qsg/resources/copy-files.sh
new file mode 100644
index 00000000..8bb28f16
--- /dev/null
+++ b/modules/core/scripts/mobile-qsg/resources/copy-files.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# product-emm qsg sample setup script for copying the required files
+
+echo "Copying the required files for wso2iots-3.0.0 QSG setup ..."
+cp dropings/* ../../repository/components/dropins/ 
+cp webapps/* ../../repository/deployment/server/webapps/ 
+
+
diff --git a/modules/core/scripts/mobile-qsg/resources/dropins/org.wso2.carbon.appmgt.oauth.core_1.2.6.jar b/modules/core/scripts/mobile-qsg/resources/dropins/org.wso2.carbon.appmgt.oauth.core_1.2.6.jar
deleted file mode 100644
index 4031d17b..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/dropins/org.wso2.carbon.appmgt.oauth.core_1.2.6.jar and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh b/modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh
old mode 100755
new mode 100644
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/catalog.apk b/modules/core/scripts/mobile-qsg/resources/script/apps/android/catalog.apk
deleted file mode 100644
index 473f5805..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/catalog.apk and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/banner.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/banner.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/banner.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/icon.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/icon.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/icon.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen1.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen1.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen1.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen2.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen2.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen2.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen3.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen3.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/android/images/screen3.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/PNDemo.ipa b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/PNDemo.ipa
deleted file mode 100644
index 01729c7c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/PNDemo.ipa and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/banner.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/banner.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/banner.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/icon.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/icon.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/icon.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen1.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen1.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen1.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen2.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen2.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen2.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen3.jpg b/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen3.jpg
deleted file mode 100644
index 002dea5c..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script/apps/ios/images/screen3.jpg and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/script_and_resources.zip b/modules/core/scripts/mobile-qsg/resources/script_and_resources.zip
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#oauth#v1.0.war b/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#oauth#v1.0.war
deleted file mode 100644
index 0ac47ebc..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#oauth#v1.0.war and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#publisher#v1.1.war b/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#publisher#v1.1.war
deleted file mode 100644
index 4af5073d..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#publisher#v1.1.war and /dev/null differ
diff --git a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#store#v1.1.war b/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#store#v1.1.war
deleted file mode 100644
index 410a01ea..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/webapps/api#appm#store#v1.1.war and /dev/null differ