diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index f43229c9..9370e5f5 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -745,14 +745,14 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-       <!-- <file>
+       <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
-        </file>-->
+        </file>
 
         <!-- portal-->
         <file>
diff --git a/modules/analytics/distribution/src/assembly/filter.properties b/modules/analytics/distribution/src/assembly/filter.properties
index 732714a7..3a658fef 100644
--- a/modules/analytics/distribution/src/assembly/filter.properties
+++ b/modules/analytics/distribution/src/assembly/filter.properties
@@ -1,7 +1,7 @@
 product.name=WSO2 IoT - Analytics
-product.version=1.0.0-ALPHA
+product.version=1.0.0
 product.key=wso2iot-analytics
-carbon.product.version=4.4.3
+carbon.product.version=4.4.10
 default.server.role=IoTServer
 cep.server.role=ComplexEventProcessor
 das.server.role=DataAnalyticsServer
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index a1f87246..73a3b49b 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -363,7 +363,7 @@
 
                                 <!-- Transport Adapters -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.adapter.feature:${carbon.device.mgt.plugin.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!--End Transport Adapters -->
                                 <!-- Carbon metrics -->
@@ -762,10 +762,10 @@
                                 </feature>
                                 <!--END - Tools-->
                                 <!-- Transport Adapters -->
-                               <!-- <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.adapter.feature.group</id>
+                               <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>-->
+                                </feature>
                                 <!-- End Transport Adapters -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
@@ -781,6 +781,7 @@
                                     <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
+
                                 <!-- End of IoT Analytics Features -->
 
                                 <!-- Geo Dashboard Feature -->
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 248cff55..6c94225b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -28,11 +28,101 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2iot-distribution-parent</artifactId>
+    <artifactId>wso2iot</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 IoT - Distribution Parent</name>
     <description>WSO2 IoT Distribution Module</description>
 
-    <modules>
-    </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>maven-buildnumber-plugin</artifactId>
+                <version>0.9.4</version>
+                <configuration>
+                    <format>{0,date,dd MMM yyyy}</format>
+                    <items>
+                        <item>timestamp</item>
+                    </items>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>2-unpack-wso2carbon</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.iot</groupId>
+                                    <artifactId>wso2iot-core</artifactId>
+                                    <version>${product.iot.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.wso2.iot</groupId>
+                                    <artifactId>wso2iot-analytics</artifactId>
+                                    <version>${product.iot.analytics.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>1-pre-dist</id>
+                        <phase>package</phase>
+                        <!--we are creating a temporary carbon distribution for document extracting purposes during the test phase-->
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>${basedir}/src/assembly/dist.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <identity.jar.version>${carbon.identity.framework.version}</identity.jar.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
 </project>
diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
new file mode 100644
index 00000000..33945c0a
--- /dev/null
+++ b/modules/distribution/src/assembly/dist.xml
@@ -0,0 +1,50 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<assembly>
+    <id>wso2iot</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <!-- Copying p2 profile and osgi bundles-->
+        <fileSet>
+            <directory>target/wso2iot-core-${product.iot.version}/</directory>
+            <outputDirectory>wso2iot-${product.iot.version}/core</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/wso2iot-analytics-${product.iot.version}</directory>
+            <outputDirectory>wso2iot-${product.iot.version}/analytics</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/resources/bin</directory>
+            <outputDirectory>wso2iot-${product.iot.version}/bin</outputDirectory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+            <fileMode>755</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/modules/distribution/src/resources/bin/start-all.sh b/modules/distribution/src/resources/bin/start-all.sh
new file mode 100644
index 00000000..6bf60277
--- /dev/null
+++ b/modules/distribution/src/resources/bin/start-all.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+#start-all.sh
+# ----------------------------------------------------------------------------
+#  Copyright 2005-2012 WSO2, Inc. http://www.wso2.org
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ls=`ls -ld "$PRG"`
+link=`expr "$ls" : '.*-> \(.*\)$'`
+if expr "$link" : '.*/.*' > /dev/null; then
+PRG="$link"
+else
+PRG=`dirname "$PRG"`/"$link"
+fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set CARBON_HOME if not already set
+[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
+
+sh "$CARBON_HOME/core/bin/wso2server.sh" $* &
+sh "$CARBON_HOME/analytics/bin/wso2server.sh" $* &
+
+trap "sh $CARBON_HOME/bin/stop-all.sh; exit;" SIGINT SIGTERM
+
+while :
+do
+sleep 60
+done
+
diff --git a/modules/distribution/src/resources/bin/stop-all.sh b/modules/distribution/src/resources/bin/stop-all.sh
new file mode 100644
index 00000000..79037dc2
--- /dev/null
+++ b/modules/distribution/src/resources/bin/stop-all.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#stop-all.sh
+# ----------------------------------------------------------------------------
+#  Copyright 2016 WSO2, Inc. http://www.wso2.org
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ls=`ls -ld "$PRG"`
+link=`expr "$ls" : '.*-> \(.*\)$'`
+if expr "$link" : '.*/.*' > /dev/null; then
+PRG="$link"
+else
+PRG=`dirname "$PRG"`/"$link"
+fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set CARBON_HOME if not already set
+[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
+
+sh "$CARBON_HOME/core/bin/wso2server.sh" stop
+sh "$CARBON_HOME/analytics/bin/wso2server.sh" stop
+exit
diff --git a/pom.xml b/pom.xml
index 97f75dd0..63002202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
     <modules>
         <module>modules/core</module>
         <module>modules/analytics</module>
+        <module>modules/distribution</module>
     </modules>
 
     <dependencyManagement>