diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 625a7f70..9b6cb6fc 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -404,13 +404,19 @@
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches" />
-                                
+
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics" />
+
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
                                     <fileset dir="src/repository/jaggeryapps"></fileset>
                                 </copy>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches" overwrite="true">
                                     <fileset dir="src/sketches" />
                                 </copy>
+
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics" overwrite="true">
+                                    <fileset dir="src/statistics" />
+                                </copy>
                                 <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 267f8312..2ef68f35 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -424,6 +424,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!--        <file>
                     <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
                     </source>
diff --git a/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
index 951d752c..5fec123a 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
@@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config();
 var utility = require("/modules/utility.js").utility;
 
 var result;
-var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.devicecloud.usage.statistics.IoTUsageStatisticsClient;
+var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient;
 
 if (uriMatcher.match("/{context}/api/stats")) {
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
index bcd3e72c..95d29d05 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
@@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config();
 var utility = require("/modules/utility.js").utility;
 
 var result;
-var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.devicecloud.usage.statistics.IoTUsageStatisticsClient;
+var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient;
 
 if (uriMatcher.match("/{context}/api/stats")) {
 
diff --git a/modules/distribution/src/statistics/IOT_Analytics.tbox b/modules/distribution/src/statistics/IOT_Analytics.tbox
new file mode 100644
index 00000000..bcf83b96
Binary files /dev/null and b/modules/distribution/src/statistics/IOT_Analytics.tbox differ