diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/samples/pom.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/pom.xml
rename to modules/distribution/src/analytics/samples/pom.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 1d6091a3..48219d8f 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -648,15 +648,6 @@
             </excludes>
         </fileSet>
 
-        <fileSet>
-            <directory>src/core/plugins</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/plugins</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-			<filtered>true</filtered>
-        </fileSet>
-
         <fileSet>
             <directory>src/core/samples</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory>
@@ -665,8 +656,9 @@
             </includes>
             <fileMode>644</fileMode>
             <excludes>
-                <exclude>**/*samples-deployer.xml</exclude>
+                <exclude>**/*connectedcup-samples-deployer.xml</exclude>
                 <exclude>**/*connectedcup/pom.xml</exclude>
+                <exclude>**/*device-plugins-deployer.xml</exclude>
             </excludes>
         </fileSet>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
@@ -924,8 +916,8 @@
         </fileSet>
 
         <fileSet>
-            <directory>src/analytics/plugins</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
+            <directory>src/analytics/samples</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/samples</outputDirectory>
 			<filtered>true</filtered>
         </fileSet>
 
@@ -1631,6 +1623,24 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/samples/connectedcup-samples-deployer.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/samples/device-plugins-deployer.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/samples/connectedcup/pom.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/connectedcup/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
 
         <!-- ********************************* Start of Analytics Profile ********************************* -->
@@ -1895,18 +1905,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/core/samples/samples-deployer.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/core/samples/connectedcup/pom.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/samples/connectedcup/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- ********************************* End of Broker Profile ********************************* -->
     </files>
 </assembly>
diff --git a/modules/distribution/src/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
similarity index 100%
rename from modules/distribution/src/core/samples/samples-deployer.xml
rename to modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
similarity index 99%
rename from modules/distribution/src/core/plugins/plugins-deployer.xml
rename to modules/distribution/src/core/samples/device-plugins-deployer.xml
index 5fe2d560..5bdb1247 100644
--- a/modules/distribution/src/core/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -33,7 +33,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>../wso2/analytics/plugins</module>
+        <module>../wso2/analytics/samples</module>
     </modules>
 
     <build>