diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 5b6764a1..52464c0e 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -38,6 +38,5 @@
         <module>features</module>
         <module>p2-profile-gen</module>
         <module>distribution</module>
-        <!--<module>integration</module>-->
     </modules>
 </project>
diff --git a/modules/core/integration/pom.xml b/modules/integration/pom.xml
similarity index 86%
rename from modules/core/integration/pom.xml
rename to modules/integration/pom.xml
index 7deebc9d..f33b2e01 100644
--- a/modules/core/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -22,14 +22,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-parent</artifactId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2iot-core-integration</artifactId>
-    <name>>WSO2 IoT - Core - Integration Tests</name>
+    <artifactId>wso2iot-integration</artifactId>
+    <name>>WSO2 IoT - Integration Tests</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/modules/core/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
similarity index 90%
rename from modules/core/integration/tests-artifacts/pom.xml
rename to modules/integration/tests-artifacts/pom.xml
index 07e6b590..e33dc24c 100644
--- a/modules/core/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -29,6 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-artifacts</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Core - Integration Test Artifacts</name>
+    <name>WSO2 IoT - Integration Test Artifacts</name>
 
 </project>
diff --git a/modules/core/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
similarity index 94%
rename from modules/core/integration/tests-common/admin-clients/pom.xml
rename to modules/integration/tests-common/admin-clients/pom.xml
index 909710e9..d7554600 100644
--- a/modules/core/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -29,6 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.integration.common.clients</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server - Integration Test Common Admin Clients</name>
+    <name>WSO2 IoT - Integration Test Common Admin Clients</name>
 
 </project>
diff --git a/modules/core/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
similarity index 100%
rename from modules/core/integration/tests-common/integration-test-utils/pom.xml
rename to modules/integration/tests-common/integration-test-utils/pom.xml
diff --git a/modules/core/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
similarity index 95%
rename from modules/core/integration/tests-common/pom.xml
rename to modules/integration/tests-common/pom.xml
index 2326e1fe..a9d2d3cc 100644
--- a/modules/core/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/modules/core/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
similarity index 98%
rename from modules/core/integration/tests-common/ui-pages/pom.xml
rename to modules/integration/tests-common/ui-pages/pom.xml
index 8eebf824..cdc008aa 100644
--- a/modules/core/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -31,7 +31,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT - Core - Integration Test Common UI Pages</name>
+    <name>WSO2 IoT - Integration Test Common UI Pages</name>
 
     <dependencies>
         <dependency>
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/HomePage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/HomePage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/HomePage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/HomePage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/MDMHomePage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/MDMHomePage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/MDMHomePage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/MDMHomePage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/MDMLoginPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/MDMLoginPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/MDMLoginPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/MDMLoginPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/ManagementConsoleLoginPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/ManagementConsoleLoginPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/ManagementConsoleLoginPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/ManagementConsoleLoginPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/platformConfiguration/PlatformConfiguration.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/platformConfiguration/PlatformConfiguration.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/platformConfiguration/PlatformConfiguration.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/platformConfiguration/PlatformConfiguration.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/AddRolePage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/AddRolePage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/AddRolePage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/AddRolePage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/EditRolePage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/EditRolePage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/EditRolePage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/EditRolePage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/RoleListPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/RoleListPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/RoleListPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/role/RoleListPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/AddUserPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/AddUserPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/AddUserPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/AddUserPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserAddedPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserAddedPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserAddedPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserAddedPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserEditPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserEditPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserEditPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserEditPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserListPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserListPage.java
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserListPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/user/UserListPage.java
diff --git a/modules/core/integration/tests-common/ui-pages/src/main/resources/mapper.properties b/modules/integration/tests-common/ui-pages/src/main/resources/mapper.properties
similarity index 100%
rename from modules/core/integration/tests-common/ui-pages/src/main/resources/mapper.properties
rename to modules/integration/tests-common/ui-pages/src/main/resources/mapper.properties
diff --git a/modules/core/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml
similarity index 98%
rename from modules/core/integration/tests-common/web-ui-pages/pom.xml
rename to modules/integration/tests-common/web-ui-pages/pom.xml
index c978173e..818cf2a5 100644
--- a/modules/core/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@@ -31,7 +31,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server - Integration Test Common Web UI Pages</name>
+    <name>WSO2 IoT - Integration Test Common Web UI Pages</name>
 
     <dependencies>
         <dependency>
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
rename to modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
diff --git a/modules/core/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties b/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
similarity index 100%
rename from modules/core/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
rename to modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
diff --git a/modules/core/integration/tests-integration-old/pom.xml b/modules/integration/tests-integration-old/pom.xml
similarity index 99%
rename from modules/core/integration/tests-integration-old/pom.xml
rename to modules/integration/tests-integration-old/pom.xml
index acb83819..6c558cce 100644
--- a/modules/core/integration/tests-integration-old/pom.xml
+++ b/modules/integration/tests-integration-old/pom.xml
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-integration</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server Backend Integration Tests</name>
+    <name>WSO2 IoT - Backend Integration Tests</name>
 
     <build>
         <plugins>
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/automation.xml b/modules/integration/tests-integration-old/src/test/resources/automation.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/automation.xml
rename to modules/integration/tests-integration-old/src/test/resources/automation.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/automationSchema.xsd b/modules/integration/tests-integration-old/src/test/resources/automationSchema.xsd
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/automationSchema.xsd
rename to modules/integration/tests-integration-old/src/test/resources/automationSchema.xsd
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/filters.txt b/modules/integration/tests-integration-old/src/test/resources/filters.txt
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/filters.txt
rename to modules/integration/tests-integration-old/src/test/resources/filters.txt
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/instrumentation.txt b/modules/integration/tests-integration-old/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/instrumentation.txt
rename to modules/integration/tests-integration-old/src/test/resources/instrumentation.txt
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks
rename to modules/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks
rename to modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks
rename to modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/log4j.properties b/modules/integration/tests-integration-old/src/test/resources/log4j.properties
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/log4j.properties
rename to modules/integration/tests-integration-old/src/test/resources/log4j.properties
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml b/modules/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml
rename to modules/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/testng.xml b/modules/integration/tests-integration-old/src/test/resources/testng.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/testng.xml
rename to modules/integration/tests-integration-old/src/test/resources/testng.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml
diff --git a/modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml
similarity index 100%
rename from modules/core/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml
diff --git a/modules/core/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
similarity index 98%
rename from modules/core/integration/tests-integration/pom.xml
rename to modules/integration/tests-integration/pom.xml
index 7db1f038..6c558cce 100644
--- a/modules/core/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-integration</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT - Core - Backend Integration Tests</name>
+    <name>WSO2 IoT - Backend Integration Tests</name>
 
     <build>
         <plugins>
diff --git a/modules/core/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/automation.xml
rename to modules/integration/tests-integration/src/test/resources/automation.xml
diff --git a/modules/core/integration/tests-integration/src/test/resources/filters.txt b/modules/integration/tests-integration/src/test/resources/filters.txt
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/filters.txt
rename to modules/integration/tests-integration/src/test/resources/filters.txt
diff --git a/modules/core/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/instrumentation.txt
rename to modules/integration/tests-integration/src/test/resources/instrumentation.txt
diff --git a/modules/core/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
rename to modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/core/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
rename to modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/core/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
rename to modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
diff --git a/modules/core/integration/tests-integration/src/test/resources/log4j.properties b/modules/integration/tests-integration/src/test/resources/log4j.properties
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/log4j.properties
rename to modules/integration/tests-integration/src/test/resources/log4j.properties
diff --git a/modules/core/integration/tests-integration/src/test/resources/testng-server-mgt.xml b/modules/integration/tests-integration/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/testng-server-mgt.xml
rename to modules/integration/tests-integration/src/test/resources/testng-server-mgt.xml
diff --git a/modules/core/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml
similarity index 100%
rename from modules/core/integration/tests-integration/src/test/resources/testng.xml
rename to modules/integration/tests-integration/src/test/resources/testng.xml
diff --git a/modules/core/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
similarity index 99%
rename from modules/core/integration/tests-iot-web-ui/pom.xml
rename to modules/integration/tests-iot-web-ui/pom.xml
index c3dc5ccc..64f14a1e 100644
--- a/modules/core/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -21,13 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <name>WSO2 IoT - Core Integration Test UI Module</name>
+    <name>WSO2 IoT - Integration Test UI Module</name>
     <artifactId>org.wso2.carbon.iot.integration.test.web.ui.integration</artifactId>
     <packaging>jar</packaging>
 
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
rename to modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/automation.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd b/modules/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
rename to modules/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml b/modules/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar b/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
rename to modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar b/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
rename to modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar b/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
rename to modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar b/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
rename to modules/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/emma.properties
rename to modules/integration/tests-iot-web-ui/src/test/resources/emma.properties
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/filters.txt b/modules/integration/tests-iot-web-ui/src/test/resources/filters.txt
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/filters.txt
rename to modules/integration/tests-iot-web-ui/src/test/resources/filters.txt
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt b/modules/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
rename to modules/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
rename to modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/log4j.properties b/modules/integration/tests-iot-web-ui/src/test/resources/log4j.properties
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/log4j.properties
rename to modules/integration/tests-iot-web-ui/src/test/resources/log4j.properties
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml b/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml b/modules/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
diff --git a/modules/core/integration/tests-iot-web-ui/src/test/resources/testng.xml b/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
similarity index 100%
rename from modules/core/integration/tests-iot-web-ui/src/test/resources/testng.xml
rename to modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
diff --git a/modules/core/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml
similarity index 90%
rename from modules/core/integration/tests-platform/pom.xml
rename to modules/integration/tests-platform/pom.xml
index 8e9103f3..459c0451 100644
--- a/modules/core/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -28,6 +28,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-platform</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT - Core - Integration Test Platform</name>
+    <name>WSO2 IoT - Integration Test Platform</name>
 
 </project>
diff --git a/modules/core/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml
similarity index 99%
rename from modules/core/integration/tests-ui-integration/pom.xml
rename to modules/integration/tests-ui-integration/pom.xml
index e52ce715..be445685 100644
--- a/modules/core/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/pom.xml
@@ -21,13 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <name>WSO2 IoT - Core - Integration Test UI Module</name>
+    <name>WSO2 IoT - Integration Test UI Module</name>
     <artifactId>org.wso2.carbon.iot.core.integration.test.ui.integration</artifactId>
     <packaging>jar</packaging>
 
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/Constants.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/Constants.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/Constants.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/Constants.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/GeneralConfigurationTestCases.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/GeneralConfigurationTestCases.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/GeneralConfigurationTestCases.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/GeneralConfigurationTestCases.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/LoginUtils.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/LoginUtils.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/LoginUtils.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/LoginUtils.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/NotificationValidationTestCase.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/NotificationValidationTestCase.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/NotificationValidationTestCase.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/NotificationValidationTestCase.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/RoleTestCases.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/RoleTestCases.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/RoleTestCases.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/RoleTestCases.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/UserTestCase.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/UserTestCase.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/UserTestCase.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/UserTestCase.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/MDMLoginTestCase.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/MDMLoginTestCase.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/MDMLoginTestCase.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/MDMLoginTestCase.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/ManagementConsoleLoginTestCase.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/ManagementConsoleLoginTestCase.java
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/ManagementConsoleLoginTestCase.java
rename to modules/integration/tests-ui-integration/src/test/java/org/wso2/emm/ui/integration/test/login/ManagementConsoleLoginTestCase.java
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/automation.xml b/modules/integration/tests-ui-integration/src/test/resources/automation.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/automation.xml
rename to modules/integration/tests-ui-integration/src/test/resources/automation.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/automationXMLSchema.xsd b/modules/integration/tests-ui-integration/src/test/resources/automationXMLSchema.xsd
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/automationXMLSchema.xsd
rename to modules/integration/tests-ui-integration/src/test/resources/automationXMLSchema.xsd
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/axis2config/axis2_client.xml b/modules/integration/tests-ui-integration/src/test/resources/axis2config/axis2_client.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/axis2config/axis2_client.xml
rename to modules/integration/tests-ui-integration/src/test/resources/axis2config/axis2_client.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar b/modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
rename to modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar b/modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
rename to modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar b/modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
rename to modules/integration/tests-ui-integration/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar b/modules/integration/tests-ui-integration/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
rename to modules/integration/tests-ui-integration/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/emma.properties b/modules/integration/tests-ui-integration/src/test/resources/emma.properties
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/emma.properties
rename to modules/integration/tests-ui-integration/src/test/resources/emma.properties
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/filters.txt b/modules/integration/tests-ui-integration/src/test/resources/filters.txt
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/filters.txt
rename to modules/integration/tests-ui-integration/src/test/resources/filters.txt
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/instrumentation.txt
rename to modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/wso2emm.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2emm.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/products/wso2emm.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2emm.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/client-truststore.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/client-truststore.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/client-truststore.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2carbon.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2carbon.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2carbon.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2emm.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2emm.jks
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2emm.jks
rename to modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2emm.jks
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/log4j.properties b/modules/integration/tests-ui-integration/src/test/resources/log4j.properties
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/log4j.properties
rename to modules/integration/tests-ui-integration/src/test/resources/log4j.properties
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario-config.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario-config.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario-config.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario-config.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario1-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario1-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario1-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario1-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario10-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario10-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario10-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario10-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario11-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario11-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario11-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario11-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario12-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario12-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario12-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario12-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario13-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario13-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario13-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario13-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario14-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario14-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario14-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario14-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario15-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario15-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario15-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario15-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario16-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario16-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario16-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario16-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario17-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario17-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario17-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario17-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario2-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario2-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario2-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario2-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario3-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario3-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario3-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario3-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario4-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario4-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario4-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario4-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario5-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario5-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario5-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario5-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario6-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario6-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario6-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario6-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario7-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario7-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario7-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario7-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario8-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario8-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario8-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario8-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario9-policy.xml b/modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario9-policy.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/security/policies/scenario9-policy.xml
rename to modules/integration/tests-ui-integration/src/test/resources/security/policies/scenario9-policy.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/testng-server-mgt.xml b/modules/integration/tests-ui-integration/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/testng-server-mgt.xml
rename to modules/integration/tests-ui-integration/src/test/resources/testng-server-mgt.xml
diff --git a/modules/core/integration/tests-ui-integration/src/test/resources/testng.xml b/modules/integration/tests-ui-integration/src/test/resources/testng.xml
similarity index 100%
rename from modules/core/integration/tests-ui-integration/src/test/resources/testng.xml
rename to modules/integration/tests-ui-integration/src/test/resources/testng.xml