diff --git a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
index a9206c38..51a8d2fd 100755
--- a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
+++ b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
@@ -3,7 +3,7 @@
 
 echo 'Loading spark environment variables '
 export CARBON_SPARK_HOME=$CARBON_HOME
-export _SPARK_ASSEMBLY=$CARBON_SPARK_HOME/repository/components/plugins/spark-core_2.10_*.wso2*.jar
+export _SPARK_ASSEMBLY=$CARBON_SPARK_HOME/components/plugins/spark-core_2.10_*.wso2*.jar
 export SPARK_SCALA_VERSION=2.10
 # *** jars will be added to the spark classpath in the code itself. check DAS-105
 # export SPARK_CLASSPATH=`java -cp $CARBON_SPARK_HOME/repository/components/plugins/org.wso2.carbon.analytics.spark.utils*.jar org.wso2.carbon.analytics.spark.utils.ComputeClasspath $CARBON_HOME`
diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh
index 1315b4f2..888ab338 100755
--- a/modules/distribution/src/analytics/bin/wso2server.sh
+++ b/modules/distribution/src/analytics/bin/wso2server.sh
@@ -300,18 +300,26 @@ do
     -classpath "$CARBON_CLASSPATH" \
     -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
     -Djava.io.tmpdir="$CARBON_HOME/tmp" \
-    -Dcatalina.base="$CARBON_HOME/lib/tomcat" \
+    -Dcatalina.base="$CARBON_HOME/../lib/tomcat" \
     -Dwso2.server.standalone=true \
     -Dcarbon.registry.root=/ \
     -Djava.command="$JAVACMD" \
     -Dcarbon.home="$CARBON_HOME" \
     -Dlogger.server.name="IoT-Analytics" \
     -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-    -Dcarbon.config.dir.path="$CARBON_HOME/repository/conf" \
-    -Djava.util.logging.config.file="$CARBON_HOME/repository/conf/etc/logging-bridge.properties" \
-    -Dcomponents.repo="$CARBON_HOME/repository/components/plugins" \
-    -Dconf.location="$CARBON_HOME/repository/conf"\
-    -Dcom.atomikos.icatch.file="$CARBON_HOME/lib/transactions.properties" \
+    -Dcarbon.config.dir.path="$CARBON_HOME/conf" \
+    -Dcarbon.repository.dir.path="$CARBON_HOME/repository" \
+    -Dcarbon.components.dir.path="$CARBON_HOME/../components" \
+    -Dcarbon.extensions.dir.path="$CARBON_HOME/../../extensions" \
+    -Dcarbon.dropins.dir.path="$CARBON_HOME/../../dropins" \
+    -Dcarbon.external.lib.dir.path="$CARBON_HOME/../../lib" \
+    -Dcarbon.patches.dir.path="$CARBON_HOME/../../patches" \
+    -Dcarbon.servicepacks.dir.path="$CARBON_HOME/../../servicepacks" \
+    -Dcarbon.internal.lib.dir.path="$CARBON_HOME/../lib" \
+    -Djava.util.logging.config.file="$CARBON_HOME/conf/etc/logging-bridge.properties" \
+    -Dcomponents.repo="$CARBON_HOME/../components/plugins" \
+    -Dconf.location="$CARBON_HOME/conf" \
+    -Dcom.atomikos.icatch.file="$CARBON_HOME/../lib/transactions.properties" \
     -Dcom.atomikos.icatch.hide_init_file_path=true \
     -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false \
     -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \
diff --git a/modules/distribution/src/analytics/conf/carbon.xml b/modules/distribution/src/analytics/conf/carbon.xml
index f2e3ab82..a23e7ff3 100644
--- a/modules/distribution/src/analytics/conf/carbon.xml
+++ b/modules/distribution/src/analytics/conf/carbon.xml
@@ -308,7 +308,7 @@
             3. file:///home/carbon/repository/axis2.xml
             4. http://repository/conf/axis2.xml
         -->
-        <ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile>
+        <ConfigurationFile>${carbon.home}/conf/axis2/axis2.xml</ConfigurationFile>
 
         <!--
           ServiceGroupContextIdleTime, which will be set in ConfigurationContex
@@ -324,7 +324,7 @@
         <ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation>
         <!-- This axis2 xml is used in createing the configuration context by the FE server
          calling to BE server -->
-        <clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
+        <clientAxis2XmlLocation>${carbon.home}/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
         <!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. -->
         <HideAdminServiceWSDLs>true</HideAdminServiceWSDLs>
 
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index da380eb5..3e899f8e 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -124,16 +124,48 @@
             </includes>
         </fileSet>
 
-        <!-- Multi-tenancy related file -->
         <fileSet>
             <directory>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/
             </outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
+            <excludes>
+                <exclude>**/api-manager.xml</exclude>
+                <exclude>**/sso-idp-config.xml</exclude>
+                <exclude>**/application-authentication.xml</exclude>
+                <exclude>**/log4j.properties</exclude>
+                <exclude>**/nhttp.properties</exclude>
+                <exclude>**/passthru-http.properties</exclude>
+                <exclude>**/user-mgt.xml</exclude>
+                <exclude>**/master-datasources.xml</exclude>
+                <exclude>**/cdm-datasources.xml</exclude>
+                <exclude>**/tomcat/carbon/WEB-INF/web.xml</exclude>
+                <exclude>**/synapse.properties</exclude>
+                <exclude>**/etc/device-analytics-config.xml</exclude>
+                <exclude>**/synapse-handlers.xml</exclude>
+                <exclude>**/tomcat/context.xml</exclude>
+                <exclude>**/security/Owasp.CsrfGuard.Carbon.properties</exclude>
+                <exclude>**/security/Owasp.CsrfGuard.dashboard.properties</exclude>
+                <exclude>**/security/application-authenticators.xml</exclude>
+                <exclude>**/identity/application-authentication.xml</exclude>
+                <exclude>**/identity/identity-providers/iot_default.xml</exclude>
+                <exclude>**/identity/sso-idp-config.xml</exclude>
+                <exclude>**/api-manager.xml</exclude>
+                <exclude>**/app-manager.xml</exclude>
+                <exclude>**/etc/license-config.xml</exclude>
+                <exclude>**/registry.xml</exclude>
+                <exclude>**/carbon.xml</exclude>
+                <exclude>**/axis2/axis2.xml</exclude>
+                <exclude>**/etc/launch.ini</exclude>
+                <exclude>**/security/authenticators.xml</exclude>
+                <exclude>**/analytics/analytics-data-config.xml</exclude>
+                <exclude>**/identity/identity-providers/iot_default.xml</exclude>
+                <exclude>**/log4j.properties</exclude>
+                <exclude>**/etc/webapp-publisher-config.xml</exclude>
+                <exclude>**/tomcat/webapp-classloading-environments.xml</exclude>
+                <exclude>**/tomcat/catalina-server.xml</exclude>
+            </excludes>
             <filtered>true</filtered>
         </fileSet>
         <fileSet>
@@ -164,7 +196,7 @@
         <fileSet>
             <directory>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/modules
             </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/modules/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
                 <include>**/carbon/</include>
                 <include>**/jaggery-test/</include>
@@ -209,25 +241,19 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources
+            <directory>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources
             </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/datasources
-            </outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/device-types
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/device-types
-            </outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
+            <excludes>
+                <exclude>**/dbscripts/**</exclude>
+                <exclude>**/lifecycles/**</exclude>
+                <exclude>**/styles/**</exclude>
+                <exclude>**/synapse-configs/**</exclude>
+                <exclude>**/web-apps/**</exclude>
+                <exclude>**/appm-tenant-conf.xml</exclude>
+            </excludes>
         </fileSet>
+
         <fileSet>
             <directory>src/core/resources</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
@@ -236,7 +262,6 @@
             </includes>
         </fileSet>
 
-        <!--data-bridge configuration-->
         <fileSet>
             <directory>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/
@@ -249,14 +274,14 @@
         <fileSet>
             <directory>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/modules
             </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/modules/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>src/core/modules</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/modules</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/modules</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
@@ -279,7 +304,7 @@
         <!-- Copying Authentication Endpoint webapp -->
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/devicetypes
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/devicetypes
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/devicetypes
             </outputDirectory>
@@ -288,7 +313,7 @@
         <!-- Copying mdm app from devicemgt app-->
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/devicemgt/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -296,7 +321,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/devicemgt-cdmf/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -304,7 +329,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/uuf-template-app/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -314,7 +339,7 @@
         <!-- Copying windows-web-agent-->
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/windows-web-agent/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/windows-web-agent
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent
@@ -323,30 +348,11 @@
                 <exclude>**/jaggery.conf</exclude>
             </excludes>
         </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/
-            </directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent
-            </outputDirectory>
-        </fileSet>
 
         <!-- Copying android-web-agent-->
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/android-web-agent/
-            </directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent
-            </outputDirectory>
-            <excludes>
-                <exclude>**/jaggery.conf</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/android-web-agent/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent
@@ -358,7 +364,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
             </outputDirectory>
@@ -421,6 +427,17 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social
+            </outputDirectory>
+            <excludes>
+                <exclude>**/jaggery.conf</exclude>
+            </excludes>
+        </fileSet>
+
         <!-- Copying Windows Synapse files -->
         <fileSet>
             <directory>
@@ -447,17 +464,6 @@
             </includes>
         </fileSet>
 
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social
-            </outputDirectory>
-            <excludes>
-                <exclude>**/jaggery.conf</exclude>
-            </excludes>
-        </fileSet>
-
         <fileSet>
             <directory>src/core/api-resources/synapse-configs/default/sequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/
@@ -487,21 +493,6 @@
             </outputDirectory>
         </fileSet>
 
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/identity
-            </outputDirectory>
-            <includes>
-                <include>**/saml1-assertion-config</include>
-                <include>**/msg-mgt.properties</include>
-                <include>**/entitlement.properties</include>
-                <include>**/EndpointConfig.properties</include>
-                <include>**/identity.xml</include>
-                <include>**/thrift-authentication.xml</include>
-            </includes>
-        </fileSet>
         <fileSet>
             <directory>src/core/conf/identity/service-providers</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/identity/service-providers</outputDirectory>
@@ -509,30 +500,6 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/identity-providers
-            </directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/conf/identity/identity-providers
-            </outputDirectory>
-            <includes>
-                <include>**/default.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/service-providers
-            </directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/conf/identity/service-providers
-            </outputDirectory>
-            <includes>
-                <include>**/default.xml</include>
-            </includes>
-        </fileSet>
-
         <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
         <fileSet>
             <directory>
@@ -553,10 +520,10 @@
         <!-- Adding analytics theme to extensions -->
         <fileSet>
             <directory>
-                src/core/jaggeryapps/portal/themes
+                src/core/jaggeryapps/portal/themes/analytics
             </directory>
             <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/extensions/themes
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/extensions/themes/analytics
             </outputDirectory>
             <includes>
                 <include>**/*</include>
@@ -700,6 +667,12 @@
                 ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/bin
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/bin</outputDirectory>
+            <excludes>
+                <exclude>**/wso2server.sh</exclude>
+                <exclude>**/wso2server.bat</exclude>
+                <exclude>**/load-spark-env-vars.sh</exclude>
+                <exclude>**/load-spark-env-vars.bat</exclude>
+            </excludes>
         </fileSet>
 
         <!--creating an empty output event receivers directory-->
@@ -803,7 +776,8 @@
             <directory>
                 ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/
             </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/
+            </outputDirectory>
         </fileSet>
 
         <fileSet>
@@ -841,6 +815,10 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/tomcat/carbon/WEB-INF</outputDirectory>
             <fileMode>755</fileMode>
         </file>
+        <file>
+            <source>src/core/conf/tomcat/webapp-classloading-environments.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/conf/tomcat</outputDirectory>
+        </file>
         <!--TODO: change the wso2 server sh file name-->
         <file>
             <source>src/core/bin/wso2server.sh</source>
@@ -913,6 +891,12 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/conf/tomcat/catalina-server.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/conf/tomcat</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying Owasp property files-->
         <file>
             <source>src/core/conf/security/Owasp.CsrfGuard.Carbon.properties</source>
@@ -922,22 +906,6 @@
             <source>src/core/conf/security/Owasp.CsrfGuard.dashboard.properties</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/security</outputDirectory>
         </file>
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/event-broker.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/registry-event-broker.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>src/core/INSTALL.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -974,18 +942,9 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying logging-config.xml -->
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/etc/logging-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
-            <source>src/core/conf/application-authenticators.xml</source>
+            <source>src/core/conf/security/application-authenticators.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/security/
             </outputDirectory>
             <filtered>true</filtered>
@@ -997,14 +956,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/oidc-scope-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf/identity/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>src/core/conf/identity/application-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/identity
@@ -1025,22 +976,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/conf/identity</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying governance.xml -->
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-        <!-- Copying apim-integration.xml -->
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/apim-integration.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/conf</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying api-manager.xml -->
         <file>
             <source>src/core/conf/api-manager.xml</source>
@@ -1340,6 +1275,22 @@
                 ${pom.artifactId}-${pom.version}/dropins
             </outputDirectory>
         </file>
+        <file>
+            <source>
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
+            </source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/conf/
+            </outputDirectory>
+        </file>
+        <file>
+            <source>
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties
+            </source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/conf/identity
+            </outputDirectory>
+        </file>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
 
         <!-- ********************************* Start of Analytics Profile ********************************* -->
@@ -1461,7 +1412,8 @@
             <source>
                 src/analytics/jaggeryapps/portal/designer.json
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/jaggeryapps/portal/configs/
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/jaggeryapps/portal/configs/
             </outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1484,14 +1436,16 @@
 
         <file>
             <source>src/analytics/resources/geodashboard/events.csv</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/
             </outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>src/analytics/resources/geodashboard/events_streamConfiguration.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/
             </outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1509,7 +1463,8 @@
             <source>
                 ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/
+            </outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- ********************************* End of Analytics Profile ********************************* -->
diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
index 54deb319..e27c8137 100644
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@@ -33,6 +33,7 @@
                 <exclude>**/*.lock</exclude>
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
+                <exclude>features/**</exclude>
                 <exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
             </excludes>
         </fileSet>
@@ -46,8 +47,13 @@
                 <exclude>**/*.lock</exclude>
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
+                <exclude>features/**</exclude>
                 <exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
             </excludes>
+            <includes>
+                <include>plugins/**</include>
+            </includes>
         </fileSet>
+
     </fileSets>
 </assembly>
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 4a97a77f..41ed4b3b 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -18,9 +18,8 @@
 
 product.name=WSO2 IoT Server
 product.key=IoT
-product.version=6.0.0
+product.version=3.1.0
 
 carbon.version=4.4.14
-ei.version=3.1.0
 default.server.role=IoTServer
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
diff --git a/modules/distribution/src/core/bin/wso2server.sh b/modules/distribution/src/core/bin/wso2server.sh
index b46e3e42..d91c09e5 100755
--- a/modules/distribution/src/core/bin/wso2server.sh
+++ b/modules/distribution/src/core/bin/wso2server.sh
@@ -292,7 +292,6 @@ do
     -Dcarbon.config.dir.path="$CARBON_HOME/conf" \
     -Dcarbon.components.dir.path="$CARBON_HOME/wso2/components" \
     -Dcarbon.dropins.dir.path="$CARBON_HOME/dropins" \
-    -Dtomcat.random.port.enable=true \
     -Dcarbon.external.lib.dir.path="$CARBON_HOME/lib" \
     -Dcarbon.patches.dir.path="$CARBON_HOME/patches" \
     -Dcarbon.servicepacks.dir.path="$CARBON_HOME/servicepacks" \
diff --git a/modules/distribution/src/core/conf/carbon.xml b/modules/distribution/src/core/conf/carbon.xml
index 40345945..8d79c7cb 100644
--- a/modules/distribution/src/core/conf/carbon.xml
+++ b/modules/distribution/src/core/conf/carbon.xml
@@ -302,7 +302,7 @@
 			3. file:///home/carbon/repository/axis2.xml
 			4. http://repository/conf/axis2.xml
 		-->
-		<ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile>
+		<ConfigurationFile>${carbon.home}/conf/axis2/axis2.xml</ConfigurationFile>
 
 		<!--
 		  ServiceGroupContextIdleTime, which will be set in ConfigurationContex
@@ -318,7 +318,7 @@
 		<ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation>
 		<!-- This axis2 xml is used in createing the configuration context by the FE server
 		 calling to BE server -->
-		<clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
+		<clientAxis2XmlLocation>${carbon.home}/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
 		<!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. -->
 		<HideAdminServiceWSDLs>true</HideAdminServiceWSDLs>
 
diff --git a/modules/distribution/src/core/conf/application-authenticators.xml b/modules/distribution/src/core/conf/security/application-authenticators.xml
similarity index 100%
rename from modules/distribution/src/core/conf/application-authenticators.xml
rename to modules/distribution/src/core/conf/security/application-authenticators.xml
diff --git a/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml b/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml
index fffa6b5c..02e78c06 100755
--- a/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml
+++ b/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml
@@ -23,7 +23,7 @@
     <!-- OWASP CSRFGuard per-application configuration property file location-->
     <context-param>
         <param-name>Owasp.CsrfGuard.Config</param-name>
-        <param-value>repository/conf/security/Owasp.CsrfGuard.Carbon.properties</param-value>
+        <param-value>conf/security/Owasp.CsrfGuard.Carbon.properties</param-value>
     </context-param>
     <servlet id="bridge">
         <servlet-name>bridgeservlet</servlet-name>
@@ -61,6 +61,20 @@
             <param-value>UTF-8</param-value>
         </init-param>
     </filter>
+
+    <!-- This filter sanitizes CR(\r) and LF(\n) characters in response headers centrally -->
+    <!-- and avoids response splitting vulnerability  -->
+    <filter>
+        <filter-name>CRLFPreventionFilter</filter-name>
+        <filter-class>org.wso2.carbon.ui.filters.CRLFPreventionFilter</filter-class>
+    </filter>
+
+    <!--This filter prevents CSRF vulnerabilities in POST requests with CSRF Token validation-->
+    <filter>
+        <filter-name>CSRFPreventionFilter</filter-name>
+        <filter-class>org.wso2.carbon.ui.filters.CSRFPreventionFilter</filter-class>
+    </filter>
+
     <!-- OWASP CSRFGuard filter used to validate CSRF token-->
     <filter>
         <filter-name>CSRFGuard</filter-name>
@@ -112,6 +126,19 @@
         <filter-name>CharsetFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
+
+    <!-- The mapping for the CRLFPreventionFilter -->
+    <filter-mapping>
+        <filter-name>CRLFPreventionFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--Filter mapping for the CSRFPreventionFilter-->
+    <filter-mapping>
+        <filter-name>CSRFPreventionFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>CSRFGuard</filter-name>
         <url-pattern>/*</url-pattern>
diff --git a/modules/distribution/src/core/conf/tomcat/catalina-server.xml b/modules/distribution/src/core/conf/tomcat/catalina-server.xml
index c68a93ef..fdc212f2 100644
--- a/modules/distribution/src/core/conf/tomcat/catalina-server.xml
+++ b/modules/distribution/src/core/conf/tomcat/catalina-server.xml
@@ -53,7 +53,6 @@
         <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
                    port="9443"
                    bindOnInit="false"
-                   sslProtocol="TLS"
                    sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2"
                    maxHttpHeaderSize="8192"
                    acceptorThreadCount="2"
diff --git a/modules/distribution/src/core/conf/tomcat/context.xml b/modules/distribution/src/core/conf/tomcat/context.xml
index 512337cd..b6acdd52 100644
--- a/modules/distribution/src/core/conf/tomcat/context.xml
+++ b/modules/distribution/src/core/conf/tomcat/context.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <!-- The contents of this file will be loaded for each web application -->
-<Context crossContext="true">
+<Context crossContext="true" useRelativeRedirects="false">
 
 
     <!-- Default set of monitored resources -->
diff --git a/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml
new file mode 100644
index 00000000..d1f5ecc0
--- /dev/null
+++ b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ 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.
+  -->
+
+<!--
+    This file defines the different classloading environments. This is container level config file. Individual webapps are not allowed to override these elements.
+    
+    ${carbon.home} represents the carbon.home system property.
+    Other system properties can be specified in a similar manner.
+-->
+<Classloading xmlns="http://wso2.org/projects/as/classloading-environments">
+    
+   <!-- 
+	We define three different environments. 
+	
+	1) Delegated environment - This is a virtual environment where all the resources belongs to these environments are loaded from the parent. This way you can control whats being loaded from the parent classloader. Only the packages and resources specified in the delegated environments are loaded from the parent. All the others are loaded from the local webapp's classpath. If a webapps has speficied two or more delegated environments, they all get merged at runtime. 
+    -->
+    <DelegatedEnvironments>
+
+        <DelegatedEnvironment>
+            <Name>Tomcat</Name>
+            <DelegatedPackages>javax.annotation.*,javax.ejb,javax.el,javax.persistence,javax.servlet.*,javax.xml,javax.xml.ws,org.apache.catalina.*,org.apache.coyote.*,org.apache.el.*,org.apache.jasper.*,org.apache.naming.*,org.apache.tomcat.*,com.sun.el.*,org.wso2.carbon.tomcat.jndi.*</DelegatedPackages>
+            <DelegatedResources>*,!META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin,!META-INF/openwebbeans/openwebbeans.properties,!META-INF/standard-faces-config.xml,!META-INF/faces-config.xml</DelegatedResources>
+        </DelegatedEnvironment>
+
+        <DelegatedEnvironment>
+            <Name>Carbon</Name>
+            <DelegatedPackages>*,!org.springframework.*,!org.apache.solr.*</DelegatedPackages>
+            <DelegatedResources>*,!META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin,!META-INF/openwebbeans/openwebbeans.properties,!META-INF/standard-faces-config.xml,!META-INF/faces-config.xml</DelegatedResources>
+        </DelegatedEnvironment>
+
+        <DelegatedEnvironment>
+            <Name>Javaee</Name>
+            <DelegatedPackages>*,!org.springframework.*</DelegatedPackages>
+            <DelegatedResources>*</DelegatedResources>
+        </DelegatedEnvironment>
+
+
+    </DelegatedEnvironments>
+
+
+   <!-- 
+        2) Shared  environment - These environments are loaded once and shared between multiple webapps. Certain runtimes can be shared by multiple webapps. So no need to load them per webapp.
+    -->
+
+    <!--SharedEnvironments>
+        <SharedEnvironment>
+            <name>Spring</name>
+            <Classpath></Classpath>
+        </SharedEnvironment>
+    </SharedEnvironments-->
+
+   <!-- 
+	3) Exclusive environment - These environments are loaded per webapp. Exclusive environments define a set of resources(jars) which should be loaded per webapp. e.g. CXF runtime.
+    -->	
+    <ExclusiveEnvironments>
+        <ExclusiveEnvironment>
+            <Name>CXF</Name>
+            <Classpath>${carbon.home}/wso2/lib/runtimes/cxf/*.jar;${carbon.home}/wso2/lib/runtimes/cxf/</Classpath>
+        </ExclusiveEnvironment>
+    </ExclusiveEnvironments>
+
+</Classloading>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index c4604128..dff4f564 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -586,6 +586,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.framework.version.iotcore}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.application.authz.xacml:org.wso2.carbon.identity.application.authz.xacml.server.feature:${identity.application.authz.xacml}
+                                </featureArtifactDef>
 
                                 <!-- Registry features -->
                                 <featureArtifactDef>
@@ -1196,6 +1199,10 @@
                                     </id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authz.xacml.server.feature.group</id>
+                                    <version>${identity.application.authz.xacml}</version>
+                                </feature>
                                 <!-- SSO Features -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
@@ -1856,6 +1863,10 @@
                                     <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authz.xacml.server.feature.group</id>
+                                    <version>${identity.application.authz.xacml}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.mgt.common.server.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2058,6 +2069,10 @@
                                     <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authz.xacml.server.feature.group</id>
+                                    <version>${identity.application.authz.xacml}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
@@ -2696,6 +2711,10 @@
                                     <id>org.wso2.carbon.identity.user.profile.feature.group</id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authz.xacml.server.feature.group</id>
+                                    <version>${identity.application.authz.xacml}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
                                     <version>${carbon.kernel.version}</version>
@@ -3371,6 +3390,10 @@
                                     <id>org.wso2.carbon.identity.user.profile.feature.group</id>
                                     <version>${carbon.identity.framework.version.iotcore}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authz.xacml.server.feature.group</id>
+                                    <version>${identity.application.authz.xacml}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
                                     <version>${carbon.kernel.version}</version>
diff --git a/pom.xml b/pom.xml
index d69a03ba..6d511b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1496,10 +1496,10 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.5.4</carbon.commons.version>
+        <carbon.commons.version>4.5.8</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.7.2</carbon.deployment.version>
+        <carbon.deployment.version>4.7.3</carbon.deployment.version>
 
         <!-- Carbon Identity -->
         <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
@@ -1513,7 +1513,7 @@
         <identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
         <identity.carbon.auth.saml2.version.iotcore>5.1.6</identity.carbon.auth.saml2.version.iotcore>
         <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
-        <identity.inbound.auth.oauth.version.iotcore>5.3.4</identity.inbound.auth.oauth.version.iotcore>
+        <identity.inbound.auth.oauth.version.iotcore>5.3.9-SNAPSHOT</identity.inbound.auth.oauth.version.iotcore>
         <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
         <identity.user.ws.version>5.1.4</identity.user.ws.version>
         <identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
@@ -1521,6 +1521,7 @@
         <identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
         <identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
         <identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>
+        <identity.application.authz.xacml>1.0.0</identity.application.authz.xacml>
 
         <!--JWT grant type extension feature-->
         <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
@@ -1529,8 +1530,8 @@
         <carbon.multitenancy.version>4.6.1</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.5.8</carbon.registry.version>
-        <carbon.registry.version.iotcore>4.6.0</carbon.registry.version.iotcore>
+        <carbon.registry.version>4.6.5-SNAPSHOT</carbon.registry.version>
+        <carbon.registry.version.iotcore>4.6.5-SNAPSHOT</carbon.registry.version.iotcore>
         <!-- Carbon Governance -->
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
@@ -1547,7 +1548,7 @@
         <carbon.device.mgt.plugin.version>3.0.12-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.72</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.73-SNAPSHOT</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->
@@ -1651,7 +1652,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.15</appmgt.feature.version>
+        <appmgt.feature.version>1.2.18-SNAPSHOT</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>