diff --git a/modules/distribution/iot-community/pom.xml b/modules/distribution/iot-community/pom.xml
new file mode 100644
index 0000000..83905df
--- /dev/null
+++ b/modules/distribution/iot-community/pom.xml
@@ -0,0 +1,171 @@
+<?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>io.entgra.community</groupId>
+        <artifactId>entgra-iot-distribution</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>entgra-iot-community</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Community Distribution</name>
+    <description>Entgra IoT Community Distribution</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>1-unpack-entgra-iots</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>io.entgra.community</groupId>
+                                    <artifactId>entgra-iot</artifactId>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>2-p2-repo-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-repo-gen</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <publishArtifacts>true</publishArtifacts>
+                            <publishArtifactRepository>true</publishArtifactRepository>
+                            <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                            </featureArtifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>feature-install</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>default</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>${basedir}/target/${entgra-iot}/repository/components</destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <filesToInclude>
+                        ${basedir}/target/${entgra-iot}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+                    </filesToInclude>
+                    <replacements>
+                        <replacement>
+                            <token>false</token>
+                            <value>true</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>2-dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <encoding>UTF-8</encoding>
+                            <filters>
+                                <filter>${basedir}/src/assembly/filter.properties</filter>
+                            </filters>
+                            <escapeString>\</escapeString>
+                            <descriptors>
+                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
+                            </descriptors>
+                            <archiverConfig>
+                                <defaultDirectoryMode>0775</defaultDirectoryMode>
+                                <directoryMode>0775</directoryMode>
+                                <defaultFileMode>0644</defaultFileMode>
+                                <fileMode>0644</fileMode>
+                            </archiverConfig>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/modules/distribution/iot-community/src/assembly/bin.xml b/modules/distribution/iot-community/src/assembly/bin.xml
new file mode 100644
index 0000000..73cf925
--- /dev/null
+++ b/modules/distribution/iot-community/src/assembly/bin.xml
@@ -0,0 +1,63 @@
+<!--
+  ~ Copyright (c) 2021, 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.
+  -->
+
+<!DOCTYPE assembly [
+        <!ELEMENT assembly (id|formats|includeBaseDirectory|fileSets|dependencySets|files)*>
+        <!ELEMENT id (#PCDATA)>
+        <!ELEMENT formats (format)*>
+        <!ELEMENT format (#PCDATA)>
+        <!ELEMENT includeBaseDirectory (#PCDATA)>
+        <!ELEMENT fileSets (fileSet)*>
+        <!ELEMENT fileSet (directory|outputDirectory|excludes|includes|fileMode|filtered)*>
+        <!ELEMENT directory (#PCDATA)>
+        <!ELEMENT outputDirectory (#PCDATA)>
+        <!ELEMENT excludes (exclude)*>
+        <!ELEMENT exclude (#PCDATA)>
+        <!ELEMENT includes (include)*>
+        <!ELEMENT include (#PCDATA)>
+        <!ELEMENT fileMode (#PCDATA)>
+        <!ELEMENT filtered (#PCDATA)>
+        <!ELEMENT dependencySets (dependencySet)*>
+        <!ELEMENT dependencySet (outputDirectory|includes)*>
+        <!ELEMENT files (file)*>
+        <!ELEMENT file (source|outputDirectory|fileMode|filtered|destName)*>
+        <!ELEMENT source (#PCDATA)>
+        <!ELEMENT destName (#PCDATA)>
+        ]>
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/target/${entgra-iot}</directory>
+            <outputDirectory>${entgra-iot-community}</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/temp.txt</source>
+            <outputDirectory>${entgra-iot-community}/</outputDirectory>
+        </file>
+    </files>
+
+</assembly>
diff --git a/modules/distribution/src/assembly/filter.propeties b/modules/distribution/iot-community/src/assembly/filter.properties
similarity index 100%
rename from modules/distribution/src/assembly/filter.propeties
rename to modules/distribution/iot-community/src/assembly/filter.properties
diff --git a/modules/distribution/iot-community/src/temp.txt b/modules/distribution/iot-community/src/temp.txt
new file mode 100644
index 0000000..e69de29
diff --git a/modules/distribution/iot-core/pom.xml b/modules/distribution/iot-core/pom.xml
new file mode 100644
index 0000000..1a5fce8
--- /dev/null
+++ b/modules/distribution/iot-core/pom.xml
@@ -0,0 +1,71 @@
+<?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>io.entgra.community</groupId>
+        <artifactId>entgra-iot-distribution</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>entgra-iot</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT Core Distribution</name>
+    <description>Entgra IoT Core Distribution</description>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>2-dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <encoding>UTF-8</encoding>
+                            <filters>
+                                <filter>${basedir}/src/assembly/filter.properties</filter>
+                            </filters>
+                            <escapeString>\</escapeString>
+                            <descriptors>
+                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
+                            </descriptors>
+                            <archiverConfig>
+                                <defaultDirectoryMode>0775</defaultDirectoryMode>
+                                <directoryMode>0775</directoryMode>
+                                <defaultFileMode>0644</defaultFileMode>
+                                <fileMode>0644</fileMode>
+                            </archiverConfig>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/iot-core/src/assembly/bin.xml
similarity index 97%
rename from modules/distribution/src/assembly/bin.xml
rename to modules/distribution/iot-core/src/assembly/bin.xml
index 44c436c..3b509d0 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/iot-core/src/assembly/bin.xml
@@ -48,7 +48,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>../p2-profile/iot-core-profile/target/${wso2am}</directory>
+            <directory>../../p2-profile/iot-core-profile/target/${wso2am}</directory>
             <outputDirectory>${entgra-iot}</outputDirectory>
             <excludes>
                 <exclude>**/repository/conf/tomcat/context.xml</exclude>
diff --git a/modules/distribution/iot-core/src/assembly/filter.propeties b/modules/distribution/iot-core/src/assembly/filter.propeties
new file mode 100644
index 0000000..e69de29
diff --git a/modules/distribution/src/core/bin/iot-server.bat b/modules/distribution/iot-core/src/core/bin/iot-server.bat
similarity index 100%
rename from modules/distribution/src/core/bin/iot-server.bat
rename to modules/distribution/iot-core/src/core/bin/iot-server.bat
diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/iot-core/src/core/bin/iot-server.sh
similarity index 100%
rename from modules/distribution/src/core/bin/iot-server.sh
rename to modules/distribution/iot-core/src/core/bin/iot-server.sh
diff --git a/modules/distribution/src/core/conf/deployment.toml b/modules/distribution/iot-core/src/core/conf/deployment.toml
similarity index 100%
rename from modules/distribution/src/core/conf/deployment.toml
rename to modules/distribution/iot-core/src/core/conf/deployment.toml
diff --git a/modules/distribution/src/core/conf/tomcat/context.xml b/modules/distribution/iot-core/src/core/conf/tomcat/context.xml
similarity index 100%
rename from modules/distribution/src/core/conf/tomcat/context.xml
rename to modules/distribution/iot-core/src/core/conf/tomcat/context.xml
diff --git a/modules/distribution/src/core/resources/extensions/cookie-policy-content.jsp b/modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/cookie-policy-content.jsp
rename to modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp
diff --git a/modules/distribution/src/core/resources/extensions/customAssets/logo.svg b/modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/customAssets/logo.svg
rename to modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg
diff --git a/modules/distribution/src/core/resources/extensions/header.jsp b/modules/distribution/iot-core/src/core/resources/extensions/header.jsp
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/header.jsp
rename to modules/distribution/iot-core/src/core/resources/extensions/header.jsp
diff --git a/modules/distribution/src/core/resources/extensions/privacy-policy-content.jsp b/modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/privacy-policy-content.jsp
rename to modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp
diff --git a/modules/distribution/src/core/resources/extensions/product-title.jsp b/modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/product-title.jsp
rename to modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp
diff --git a/modules/distribution/src/core/resources/extensions/title.jsp b/modules/distribution/iot-core/src/core/resources/extensions/title.jsp
similarity index 100%
rename from modules/distribution/src/core/resources/extensions/title.jsp
rename to modules/distribution/iot-core/src/core/resources/extensions/title.jsp
diff --git a/modules/distribution/src/core/synapse-configs/default/api/_TokenAPI_.xml b/modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml
similarity index 100%
rename from modules/distribution/src/core/synapse-configs/default/api/_TokenAPI_.xml
rename to modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 21be5b7..ef959e9 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -20,52 +20,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>io.entgra.iot</groupId>
-        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.1-SNAPSHOT</version>
+        <groupId>io.entgra.community</groupId>
+        <artifactId>community-parent</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>entgra-iot</artifactId>
+    <artifactId>entgra-iot-distribution</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra IoT - Distribution</name>
-    <description>Entgra IoT Distribution</description>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>2-dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <encoding>UTF-8</encoding>
-                            <filters>
-                                <filter>${basedir}/src/assembly/filter.properties</filter>
-                            </filters>
-                            <escapeString>\</escapeString>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                            </descriptors>
-                            <archiverConfig>
-                                <defaultDirectoryMode>0775</defaultDirectoryMode>
-                                <directoryMode>0775</directoryMode>
-                                <defaultFileMode>0644</defaultFileMode>
-                                <fileMode>0644</fileMode>
-                            </archiverConfig>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <name>Entgra IoT - Distribution Module</name>
+    <description>Entgra IoT Distribution Module</description>
 
+    <modules>
+        <module>iot-core</module>
+        <module>iot-community</module>
+    </modules>
 </project>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
new file mode 100644
index 0000000..ec89b2d
--- /dev/null
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.entgra.community</groupId>
+        <artifactId>p2-profile</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>iot-core-p2-profile</artifactId>
+    <name>Entgra IoT - Core P2 Profile Gen</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database.wso2</groupId>
+            <artifactId>h2-database-engine</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-solution</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target name="extract-pack">
+                                <unzip src="${wso2am}.zip" dest="target" overwrite="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                         <!--Creating Device Management schema-->
+                        <id>create-device-mgt-schema</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo message="########### Create Device Management H2 Schema ###########" />
+                                <property name="db.dir" value="target/${wso2am}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+
+                                    <fileset file="${basedir}/target/${wso2am}/dbscripts/cdm/h2.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                         <!--Creating Certificate Management schema-->
+                        <id>create-certificate-mgt-schema</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo message="########### Create Certificate Management H2 Schema ###########" />
+
+                                <property name="db.dir" value="target/${wso2am}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+                                    <fileset file="${basedir}/target/${wso2am}/dbscripts/certMgt/h2.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>2-p2-repo-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-repo-gen</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <publishArtifacts>true</publishArtifacts>
+                            <publishArtifactRepository>true</publishArtifactRepository>
+
+                            <featureArtifacts>
+                                <!-- Device Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    io.entgra.devicemgt:io.entgra.ui.request.interceptor.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of Device Management Features -->
+
+                                <!-- SMS Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of SMS Management Features -->
+
+                                <!-- App Manager Features-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of New App Manager Features-->
+                            </featureArtifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>feature-install</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>default</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>${basedir}/target/${wso2am}/repository/components</destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!--Device Management Features-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--App Manager Features-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--End of App Manager Features-->
+
+                                <!--SMS Management Features-->
+                                <feature>
+                                    <id>io.entgra.transport.mgt.sms.handler.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>io.entgra.transport.mgt.sms.handler.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--End of SMS Management Features-->
+
+                                <!--Email Sender Feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--Apimgt Extension Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--Certificate Mgt Features-->
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--Device Mgt Extension Features-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--Heartbeat Mgt-->
+                                <feature>
+                                    <id>io.entgra.server.heart.beat.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--jwt client-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--policy mgt-->
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--UI request interceptor-->
+                                <feature>
+                                    <id>io.entgra.ui.request.interceptor.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--Webapp authentication framework-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+
+
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <filesToInclude>
+                        ${basedir}/target/${wso2am}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+                    </filesToInclude>
+                    <replacements>
+                        <replacement>
+                            <token>false</token>
+                            <value>true</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml
index 9ddcb1b..8376f59 100644
--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@@ -20,14 +20,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>io.entgra.iot</groupId>
-        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.1-SNAPSHOT</version>
+        <groupId>io.entgra.community</groupId>
+        <artifactId>community-parent</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>entgra-iot-p2-profile</artifactId>
+    <artifactId>p2-profile</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - P2 Profile Module</name>
     <url>http://entgra.io</url>
diff --git a/pom.xml b/pom.xml
index d764b74..d115ee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.iot</groupId>
-    <artifactId>entgra-iot-server-parent</artifactId>
+    <groupId>io.entgra.community</groupId>
+    <artifactId>community-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.1.1-SNAPSHOT</version>
-    <name>Entgra IoT - Parent</name>
+    <version>5.0.0-SNAPSHOT</version>
+    <name>Entgra Community Product - Parent</name>
     <url>http://entgra.io</url>
-    <description>Entgra IoT Server</description>
+    <description>Entgra Community Product</description>
 
     <parent>
         <groupId>org.wso2</groupId>
@@ -90,6 +90,11 @@
                 <version>${orbit.h2.engine.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.entgra.community</groupId>
+                <artifactId>entgra-iot</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -97,6 +102,7 @@
 
         <wso2am>wso2am-4.0.0</wso2am>
         <entgra-iot>entgra-iot-${project.version}</entgra-iot>
+        <entgra-iot-community>entgra-iot-community-${project.version}</entgra-iot-community>
 
         <!-- Carbon Device Management-->
         <carbon.device.mgt.version>4.1.16-SNAPSHOT</carbon.device.mgt.version>
@@ -106,6 +112,9 @@
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
 
+        <carbon.device.mgt.plugin.version>5.0.16-SNAPSHOT</carbon.device.mgt.plugin.version>
+
+
     </properties>
 
     <scm>