From 2aa751de23ba703be22873f0181d17027a3b5811 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Tue, 16 Feb 2021 18:58:00 +0530
Subject: [PATCH] Change the structure from sms-mgt to sms-handler to have
 within transport-mgt

---
 components/transport-mgt/pom.xml              | 22 +++++++++++++++++++
 .../pom.xml                                   | 12 +++++-----
 .../ConfigurationManagementService.java       | 16 +++++++-------
 .../api/service/addons/ApiOriginFilter.java   |  2 +-
 .../addons/GsonMessageBodyHandler.java        |  2 +-
 .../ConfigurationManagementServiceImpl.java   |  6 ++---
 .../webapp/META-INF/webapp-classloading.xml   |  0
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  4 ++--
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 .../pom.xml                                   |  6 ++---
 .../handler/common/SMSHandlerConstants.java}  |  4 ++--
 .../sms/handler}/common/bean/SMSMessage.java  |  2 +-
 .../sms/handler}/common/config/Property.java  |  2 +-
 .../common/config/SMSConfiguration.java       |  2 +-
 .../handler}/common/config/SMSGateway.java    |  2 +-
 .../common/exception/SMSSenderException.java  |  2 +-
 .../sms/handler}/common/spi/SMSSender.java    |  6 ++---
 .../pom.xml                                   | 14 ++++++------
 .../sms/handler}/core/SMSSenderFactory.java   |  8 +++----
 .../core/config/SMSConfigurationManager.java  |  8 +++----
 .../handler}/core/impl/SampleSenderImpl.java  | 12 +++++-----
 .../internal/SMSHandlerServiceComponent.java} | 18 +++++++--------
 .../sms-handler}/pom.xml                      | 12 +++++-----
 .../src/main/resources/p2.inf                 |  3 ---
 .../src/main/resources/p2.inf                 |  4 ----
 features/transport-mgt/pom.xml                | 21 ++++++++++++++++++
 .../pom.xml                                   | 12 +++++-----
 .../src/main/resources/build.properties       |  0
 .../src/main/resources/p2.inf                 |  3 +++
 .../pom.xml                                   | 16 +++++++-------
 .../src/main/resources/conf/sms-config.xml    |  2 +-
 .../src/main/resources/p2.inf                 |  4 ++++
 .../sms-handler}/pom.xml                      | 11 +++++-----
 pom.xml                                       |  8 +++----
 34 files changed, 146 insertions(+), 102 deletions(-)
 create mode 100644 components/transport-mgt/pom.xml
 rename components/{sms-mgt/io.entgra.sms.mgt.api => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api}/pom.xml (95%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler}/api/service/ConfigurationManagementService.java (88%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler}/api/service/addons/ApiOriginFilter.java (96%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler}/api/service/addons/GsonMessageBodyHandler.java (97%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler}/api/service/impl/ConfigurationManagementServiceImpl.java (88%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (90%)
 rename components/{sms-mgt/io.entgra.sms.mgt.api => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api}/src/main/webapp/WEB-INF/web.xml (96%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common}/pom.xml (95%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/SMSMgtConstants.java => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java} (65%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/bean/SMSMessage.java (96%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/config/Property.java (95%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/config/SMSConfiguration.java (97%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/config/SMSGateway.java (97%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/exception/SMSSenderException.java (95%)
 rename components/{sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler}/common/spi/SMSSender.java (86%)
 rename components/{sms-mgt/io.entgra.sms.mgt.core => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core}/pom.xml (90%)
 rename components/{sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler}/core/SMSSenderFactory.java (91%)
 rename components/{sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler}/core/config/SMSConfigurationManager.java (93%)
 rename components/{sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler}/core/impl/SampleSenderImpl.java (81%)
 rename components/{sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/internal/SMSMgtServiceComponent.java => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java} (64%)
 rename components/{sms-mgt => transport-mgt/sms-handler}/pom.xml (79%)
 delete mode 100644 features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/p2.inf
 delete mode 100644 features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/p2.inf
 create mode 100644 features/transport-mgt/pom.xml
 rename features/{sms-mgt/io.entgra.sms.mgt.api.feature => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature}/pom.xml (91%)
 rename features/{sms-mgt/io.entgra.sms.mgt.api.feature => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature}/src/main/resources/build.properties (100%)
 create mode 100644 features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf
 rename features/{sms-mgt/io.entgra.sms.mgt.server.feature => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature}/pom.xml (87%)
 rename features/{sms-mgt/io.entgra.sms.mgt.server.feature => transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature}/src/main/resources/conf/sms-config.xml (91%)
 create mode 100644 features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf
 rename features/{sms-mgt => transport-mgt/sms-handler}/pom.xml (80%)

diff --git a/components/transport-mgt/pom.xml b/components/transport-mgt/pom.xml
new file mode 100644
index 0000000000..9794bb77ca
--- /dev/null
+++ b/components/transport-mgt/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-devicemgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>4.1.12-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>transport-mgt</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Transport Component</name>
+    <url>http://entgra.io</url>
+
+    <modules>
+        <module>sms-handler</module>
+    </modules>
+
+</project>
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/pom.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
similarity index 95%
rename from components/sms-mgt/io.entgra.sms.mgt.api/pom.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
index 587153c06d..2804324cc5 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>sms-mgt</artifactId>
+        <artifactId>sms-handler</artifactId>
         <version>4.1.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.sms.mgt.api</artifactId>
+    <artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId>
     <packaging>war</packaging>
     <name>Entgra IoT - SMS Management Core</name>
     <description>Entgra IoT - SMS Management API</description>
@@ -48,7 +48,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
-                    <warName>api#sms-mgt#v1.0</warName>
+                    <warName>api#sms-handler#v1.0</warName>
                 </configuration>
             </plugin>
             <plugin>
@@ -112,7 +112,7 @@
                                     <tasks>
                                         <copy todir="${basedir}/../../../repository/deployment/server/webapps" overwrite="true">
                                             <fileset dir="${basedir}/target">
-                                                <include name="api#sms-mgt#v1.0.war" />
+                                                <include name="api#sms-handler#v1.0.war" />
                                             </fileset>
                                         </copy>
                                     </tasks>
@@ -211,12 +211,12 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.sms.mgt.core</artifactId>
+            <artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.sms.mgt.common</artifactId>
+            <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/ConfigurationManagementService.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java
similarity index 88%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/ConfigurationManagementService.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java
index d987b8149c..3a771222c7 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/ConfigurationManagementService.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/ConfigurationManagementService.java
@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.api.service;
+package io.entgra.transport.mgt.sms.handler.api.service;
 
-import io.entgra.sms.mgt.common.SMSMgtConstants;
+import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -46,12 +46,12 @@ import javax.ws.rs.core.Response;
                 extensions = {
                         @Extension(properties = {
                                 @ExtensionProperty(name = "name", value = "ConfigurationManagementService"),
-                                @ExtensionProperty(name = "context", value = "/api/sms-mgt/v1.0/configuration"),
+                                @ExtensionProperty(name = "context", value = "/api/sms-handler/v1.0/configuration"),
                         })
                 }
         ),
         tags = {
-                @Tag(name = "sms_management", description = "")
+                @Tag(name = "transport_management", description = "")
         }
 )
 @Path("/configuration")
@@ -63,8 +63,8 @@ import javax.ws.rs.core.Response;
         @Scope(
                 name = "View configurations",
                 description = "",
-                key = "perm:sms-mgt:view-configuration",
-                permissions = {"/sms-mgt/platform-configurations/view"}
+                key = "perm:sms-handler:view-configuration",
+                permissions = {"/sms-handler/platform-configurations/view"}
         )
 })
 public interface ConfigurationManagementService {
@@ -74,11 +74,11 @@ public interface ConfigurationManagementService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
             value = "Reload SMS Configuration",
-            notes = "Reload SMS Configuration in sms-mgt.xml file",
+            notes = "Reload SMS Configuration in sms-config.xml file",
             tags = "SMS Configuration Management",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = SMSMgtConstants.SCOPE, value = "perm:sms-mgt:view-configuration")
+                            @ExtensionProperty(name = SMSHandlerConstants.SCOPE, value = "perm:sms-handler:view-configuration")
                     })
             }
     )
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/ApiOriginFilter.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java
similarity index 96%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/ApiOriginFilter.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java
index 461a1574ef..867636638b 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/ApiOriginFilter.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/ApiOriginFilter.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.api.service.addons;
+package io.entgra.transport.mgt.sms.handler.api.service.addons;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/GsonMessageBodyHandler.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java
similarity index 97%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/GsonMessageBodyHandler.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java
index 6a6a640b36..9917fc119b 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/addons/GsonMessageBodyHandler.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/addons/GsonMessageBodyHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.api.service.addons;
+package io.entgra.transport.mgt.sms.handler.api.service.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/impl/ConfigurationManagementServiceImpl.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java
similarity index 88%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/impl/ConfigurationManagementServiceImpl.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java
index 38b46fba87..f849161df7 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/java/io/entgra/sms/mgt/api/service/impl/ConfigurationManagementServiceImpl.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/java/io/entgra/transport/mgt/sms/handler/api/service/impl/ConfigurationManagementServiceImpl.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.api.service.impl;
+package io.entgra.transport.mgt.sms.handler.api.service.impl;
 
-import io.entgra.sms.mgt.api.service.ConfigurationManagementService;
-import io.entgra.sms.mgt.core.config.SMSConfigurationManager;
+import io.entgra.transport.mgt.sms.handler.api.service.ConfigurationManagementService;
+import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 90%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 5fb71d8484..8c3cefe9e4 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -49,7 +49,7 @@
         <property name="scan" value="true"/>
     </bean>
 
-	<bean id="configurationManagementService" class="io.entgra.sms.mgt.api.service.impl.ConfigurationManagementServiceImpl"/>
-    <bean id="jsonProvider" class="io.entgra.sms.mgt.api.service.addons.GsonMessageBodyHandler"/>
+	<bean id="configurationManagementService" class="io.entgra.transport.mgt.sms.handler.api.service.impl.ConfigurationManagementServiceImpl"/>
+    <bean id="jsonProvider" class="io.entgra.transport.mgt.sms.handler.api.service.addons.GsonMessageBodyHandler"/>
 
 </beans>
diff --git a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml
similarity index 96%
rename from components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/web.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml
index dda9411ac4..e2e3f78aac 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/src/main/webapp/WEB-INF/web.xml
@@ -77,7 +77,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>io.entgra.sms.mgt.api.service.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.transport.mgt.sms.handler.api.service.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/pom.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
similarity index 95%
rename from components/sms-mgt/io.entgra.sms.mgt.common/pom.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
index 6595066646..328b0425c7 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>sms-mgt</artifactId>
+        <artifactId>sms-handler</artifactId>
         <version>4.1.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.sms.mgt.common</artifactId>
+    <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - SMS Management Common</name>
     <description>Entgra IoT - SMS Management Common</description>
@@ -48,7 +48,7 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>SMS Management Common Bundle</Bundle-Description>
                         <Export-Package>
-                            io.entgra.sms.mgt.common.*
+                            io.entgra.transport.mgt.sms.handler.common.*
                         </Export-Package>
                         <Import-Package>
                             io.swagger.annotations; version="${swagger.annotations.version}"; resolution:=optional,
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/SMSMgtConstants.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java
similarity index 65%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/SMSMgtConstants.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java
index cbe46d742e..c5b5e62066 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/SMSMgtConstants.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/SMSHandlerConstants.java
@@ -1,9 +1,9 @@
-package io.entgra.sms.mgt.common;
+package io.entgra.transport.mgt.sms.handler.common;
 
 /**
  * This class holds SMS Management Constants
  */
-public final class SMSMgtConstants {
+public final class SMSHandlerConstants {
 
     public static final String SCOPE = "scope";
     public static final String SMS_CONFIG_XML_NAME = "sms-config.xml";
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/bean/SMSMessage.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java
similarity index 96%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/bean/SMSMessage.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java
index 23cde039b9..f7e33116bb 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/bean/SMSMessage.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/bean/SMSMessage.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.bean;
+package io.entgra.transport.mgt.sms.handler.common.bean;
 
 import io.swagger.annotations.ApiModelProperty;
 
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/Property.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java
similarity index 95%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/Property.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java
index de667cfd11..f5a3195ae1 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/Property.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/Property.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.config;
+package io.entgra.transport.mgt.sms.handler.common.config;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSConfiguration.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java
similarity index 97%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSConfiguration.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java
index 7992533c76..ffc6952db6 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSConfiguration.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSConfiguration.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.config;
+package io.entgra.transport.mgt.sms.handler.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSGateway.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java
similarity index 97%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSGateway.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java
index 988faca8e5..a1e031328b 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/config/SMSGateway.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/config/SMSGateway.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.config;
+package io.entgra.transport.mgt.sms.handler.common.config;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/exception/SMSSenderException.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java
similarity index 95%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/exception/SMSSenderException.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java
index 8a86a0c406..06a3b4cde4 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/exception/SMSSenderException.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/exception/SMSSenderException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.exception;
+package io.entgra.transport.mgt.sms.handler.common.exception;
 
 /**
  * Exception that will be thrown during SMS Sender Management
diff --git a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/spi/SMSSender.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java
similarity index 86%
rename from components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/spi/SMSSender.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java
index 34b283384f..25fa4210fe 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.common/src/main/java/io/entgra/sms/mgt/common/spi/SMSSender.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/src/main/java/io/entgra/transport/mgt/sms/handler/common/spi/SMSSender.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.common.spi;
+package io.entgra.transport.mgt.sms.handler.common.spi;
 
-import io.entgra.sms.mgt.common.bean.SMSMessage;
-import io.entgra.sms.mgt.common.exception.SMSSenderException;
+import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage;
+import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException;
 
 /**
  * Manages the sending of SMS.
diff --git a/components/sms-mgt/io.entgra.sms.mgt.core/pom.xml b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
similarity index 90%
rename from components/sms-mgt/io.entgra.sms.mgt.core/pom.xml
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
index 09cc5826cb..d512053fec 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.core/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>sms-mgt</artifactId>
+        <artifactId>sms-handler</artifactId>
         <version>4.1.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.sms.mgt.core</artifactId>
+    <artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - SMS Management Core</name>
     <description>Entgra IoT - SMS Management Core</description>
@@ -77,9 +77,9 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>SMS Management Core Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.sms.mgt.core.internal</Private-Package>
+                        <Private-Package>io.entgra.transport.mgt.sms.handler.core.internal</Private-Package>
                         <Import-Package>
-                            io.entgra.sms.mgt.common.*,
+                            io.entgra.transport.mgt.sms.handler.common.*,
                             javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             javax.xml.bind.annotation,
                             javax.xml.bind,
@@ -89,8 +89,8 @@
                             org.wso2.carbon.device.mgt.core.*
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.sms.mgt.core.internal,
-                            io.entgra.sms.mgt.core.*
+                            !io.entgra.transport.mgt.sms.handler.core.internal,
+                            io.entgra.transport.mgt.sms.handler.core.*
                         </Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
@@ -112,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.sms.mgt.common</artifactId>
+            <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/SMSSenderFactory.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java
similarity index 91%
rename from components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/SMSSenderFactory.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java
index dd451075d6..27e7bc6802 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/SMSSenderFactory.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/SMSSenderFactory.java
@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.core;
+package io.entgra.transport.mgt.sms.handler.core;
 
-import io.entgra.sms.mgt.common.config.SMSGateway;
-import io.entgra.sms.mgt.common.spi.SMSSender;
-import io.entgra.sms.mgt.core.config.SMSConfigurationManager;
+import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway;
+import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender;
+import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/config/SMSConfigurationManager.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java
similarity index 93%
rename from components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/config/SMSConfigurationManager.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java
index bf90872d9b..aa1d64dde8 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/config/SMSConfigurationManager.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/config/SMSConfigurationManager.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.core.config;
+package io.entgra.transport.mgt.sms.handler.core.config;
 
-import io.entgra.sms.mgt.common.SMSMgtConstants;
-import io.entgra.sms.mgt.common.config.SMSConfiguration;
+import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants;
+import io.entgra.transport.mgt.sms.handler.common.config.SMSConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
@@ -41,7 +41,7 @@ public class SMSConfigurationManager {
     private static SMSConfigurationManager smsConfigurationManager;
     private SMSConfiguration smsConfiguration;
     private static final String SMS_CONFIG_PATH = CarbonUtils.getCarbonConfigDirPath() + File.separator
-            + SMSMgtConstants.SMS_CONFIG_XML_NAME;
+            + SMSHandlerConstants.SMS_CONFIG_XML_NAME;
 
     /**
      * Retrieve an instance of {@link SMSConfigurationManager}
diff --git a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/impl/SampleSenderImpl.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java
similarity index 81%
rename from components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/impl/SampleSenderImpl.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java
index c223ad92cd..a585433b95 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/impl/SampleSenderImpl.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/impl/SampleSenderImpl.java
@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.core.impl;
+package io.entgra.transport.mgt.sms.handler.core.impl;
 
-import io.entgra.sms.mgt.common.bean.SMSMessage;
-import io.entgra.sms.mgt.common.config.SMSGateway;
-import io.entgra.sms.mgt.common.exception.SMSSenderException;
-import io.entgra.sms.mgt.common.spi.SMSSender;
-import io.entgra.sms.mgt.core.config.SMSConfigurationManager;
+import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage;
+import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway;
+import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException;
+import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender;
+import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/internal/SMSMgtServiceComponent.java b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java
similarity index 64%
rename from components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/internal/SMSMgtServiceComponent.java
rename to components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java
index 849a76d59c..abaafee2b5 100644
--- a/components/sms-mgt/io.entgra.sms.mgt.core/src/main/java/io/entgra/sms/mgt/core/internal/SMSMgtServiceComponent.java
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/src/main/java/io/entgra/transport/mgt/sms/handler/core/internal/SMSHandlerServiceComponent.java
@@ -16,40 +16,40 @@
  * under the License.
  */
 
-package io.entgra.sms.mgt.core.internal;
+package io.entgra.transport.mgt.sms.handler.core.internal;
 
-import io.entgra.sms.mgt.core.config.SMSConfigurationManager;
+import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
 
 /**
  * @scr.component
- * name="io.entgra.sms.mgt.core.internal.SMSMgtServiceComponent" immediate="true"
+ * name="io.entgra.transport.mgt.sms.handler.core.internal.SMSHandlerServiceComponent" immediate="true"
  */
-public class SMSMgtServiceComponent {
+public class SMSHandlerServiceComponent {
 
-    private static final Log log = LogFactory.getLog(SMSMgtServiceComponent.class);
+    private static final Log log = LogFactory.getLog(SMSHandlerServiceComponent.class);
 
     protected void activate(ComponentContext ctx) {
 
         if (log.isDebugEnabled()) {
-            log.debug("Activating SMS Management Service Component");
+            log.debug("Activating SMS Handler Service Component");
         }
         try {
             SMSConfigurationManager.getInstance().initConfig();
 
             if (log.isDebugEnabled()) {
-                log.debug("SMS Management Service Component has been successfully activated");
+                log.debug("SMS Handler Service Component has been successfully activated");
             }
         } catch (Throwable e) {
-            log.error("Error occurred while activating SMS Management Service Component", e);
+            log.error("Error occurred while activating SMS Handler Service Component", e);
         }
     }
 
     protected void deactivate(ComponentContext ctx) {
         if (log.isDebugEnabled()) {
-            log.debug("De-activating SMS Management Service Component");
+            log.debug("De-activating SMS Handler Service Component");
         }
     }
 }
diff --git a/components/sms-mgt/pom.xml b/components/transport-mgt/sms-handler/pom.xml
similarity index 79%
rename from components/sms-mgt/pom.xml
rename to components/transport-mgt/sms-handler/pom.xml
index 4a0d9a4e8f..04710ad6d8 100644
--- a/components/sms-mgt/pom.xml
+++ b/components/transport-mgt/sms-handler/pom.xml
@@ -23,22 +23,22 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>carbon-devicemgt</artifactId>
+        <artifactId>transport-mgt</artifactId>
         <version>4.1.12-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sms-mgt</artifactId>
+    <artifactId>sms-handler</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - SMS Management Component</name>
     <url>http://entgra.io</url>
 
 
     <modules>
-        <module>io.entgra.sms.mgt.core</module>
-        <module>io.entgra.sms.mgt.common</module>
-        <module>io.entgra.sms.mgt.api</module>
+        <module>io.entgra.transport.mgt.sms.handler.core</module>
+        <module>io.entgra.transport.mgt.sms.handler.common</module>
+        <module>io.entgra.transport.mgt.sms.handler.api</module>
     </modules>
 
 </project>
diff --git a/features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/p2.inf b/features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/p2.inf
deleted file mode 100644
index 8ed8daa469..0000000000
--- a/features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.sms.mgt.api_${feature.version}/webapps/api#sms-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#sms-mgt#v1.0.war,overwrite:true);\
diff --git a/features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/p2.inf b/features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/p2.inf
deleted file mode 100644
index d5943e7fda..0000000000
--- a/features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,4 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.sms.mgt.server_${feature.version}/conf/sms-config.xml,target:${installFolder}/../../conf/sms-config.xml,overwrite:true);\
-
-instructions.unconfigure = \
diff --git a/features/transport-mgt/pom.xml b/features/transport-mgt/pom.xml
new file mode 100644
index 0000000000..d49c085590
--- /dev/null
+++ b/features/transport-mgt/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-devicemgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>4.1.12-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>transport-mgt-feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Transport Feature</name>
+    <url>http://entgra.io</url>
+
+    <modules>
+        <module>sms-handler</module>
+    </modules>
+</project>
diff --git a/features/sms-mgt/io.entgra.sms.mgt.api.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml
similarity index 91%
rename from features/sms-mgt/io.entgra.sms.mgt.api.feature/pom.xml
rename to features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml
index 976b42937c..5cc5414343 100644
--- a/features/sms-mgt/io.entgra.sms.mgt.api.feature/pom.xml
+++ b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>sms-mgt-feature</artifactId>
+        <artifactId>sms-handler-feature</artifactId>
         <version>4.1.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.sms.mgt.api.feature</artifactId>
+    <artifactId>io.entgra.transport.mgt.sms.handler.api.feature</artifactId>
     <packaging>pom</packaging>
     <version>4.1.12-SNAPSHOT</version>
     <name>Entgra IoT - SMS Management API Feature</name>
@@ -52,14 +52,14 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>io.entgra.sms.mgt.api</artifactId>
+                                    <artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
                                         ${project.build.directory}/maven-shared-archive-resources/webapps
                                     </outputDirectory>
-                                    <destFileName>api#sms-mgt#v1.0.war</destFileName>
+                                    <destFileName>api#sms-handler#v1.0.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -102,8 +102,8 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.sms.mgt.api</id>
-                            <propertiesFile>../../../features/etc/feature.properties
+                            <id>io.entgra.transport.mgt.sms.handler.api</id>
+                            <propertiesFile>../../../etc/feature.properties
                             </propertiesFile>
                             <adviceFile>
                                 <properties>
diff --git a/features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/build.properties b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties
similarity index 100%
rename from features/sms-mgt/io.entgra.sms.mgt.api.feature/src/main/resources/build.properties
rename to features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties
diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000000..ee42576e14
--- /dev/null
+++ b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.transport.mgt.sms.handler.api_${feature.version}/webapps/api#sms-handler#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#sms-handler#v1.0.war,overwrite:true);\
diff --git a/features/sms-mgt/io.entgra.sms.mgt.server.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml
similarity index 87%
rename from features/sms-mgt/io.entgra.sms.mgt.server.feature/pom.xml
rename to features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml
index f53e6de8f2..cf28c0b803 100644
--- a/features/sms-mgt/io.entgra.sms.mgt.server.feature/pom.xml
+++ b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>sms-mgt-feature</artifactId>
+        <artifactId>sms-handler-feature</artifactId>
         <version>4.1.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.sms.mgt.server.feature</artifactId>
+    <artifactId>io.entgra.transport.mgt.sms.handler.server.feature</artifactId>
     <packaging>pom</packaging>
     <version>4.1.12-SNAPSHOT</version>
     <name>Entgra IoT - SMS Management Server Feature</name>
@@ -40,11 +40,11 @@
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.sms.mgt.core</artifactId>
+            <artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.sms.mgt.common</artifactId>
+            <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
         </dependency>
     </dependencies>
 
@@ -87,8 +87,8 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.sms.mgt.server</id>
-                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <id>io.entgra.transport.mgt.sms.handler.server</id>
+                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
                                     <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
@@ -97,10 +97,10 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.sms.mgt.core:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:io.entgra.sms.mgt.common:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.common:${carbon.device.mgt.version}
                                 </bundleDef>
                             </bundles>
                             <importBundles>
diff --git a/features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/conf/sms-config.xml b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml
similarity index 91%
rename from features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/conf/sms-config.xml
rename to features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml
index ddf2e86567..d225f912ec 100644
--- a/features/sms-mgt/io.entgra.sms.mgt.server.feature/src/main/resources/conf/sms-config.xml
+++ b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml
@@ -22,7 +22,7 @@
     <Gateways>
         <!-- multiple gateways can be listed and the gateway having the isDefault=true is picked up or gateway
         extensionClass can be passed and relevant impl can be used-->
-        <Gateway name="sample" extensionClass="io.entgra.sms.mgt.core.impl.SampleSenderImpl" isDefault="true">
+        <Gateway name="sample" extensionClass="io.entgra.transport.mgt.sms.handler.core.impl.SampleSenderImpl" isDefault="true">
             <!-- properties can be listed and can be picked up in the relevant implementation class as required-->
             <Properties>
                 <Property name="sample-property">sample</Property>
diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000000..af486db59b
--- /dev/null
+++ b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf
@@ -0,0 +1,4 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.transport.mgt.sms.handler.server_${feature.version}/conf/sms-config.xml,target:${installFolder}/../../conf/sms-config.xml,overwrite:true);\
+
+instructions.unconfigure = \
diff --git a/features/sms-mgt/pom.xml b/features/transport-mgt/sms-handler/pom.xml
similarity index 80%
rename from features/sms-mgt/pom.xml
rename to features/transport-mgt/sms-handler/pom.xml
index 63f0b6dbfc..c0c005f32c 100644
--- a/features/sms-mgt/pom.xml
+++ b/features/transport-mgt/sms-handler/pom.xml
@@ -23,19 +23,20 @@
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>carbon-devicemgt</artifactId>
+        <artifactId>transport-mgt-feature</artifactId>
         <version>4.1.12-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sms-mgt-feature</artifactId>
+    <artifactId>sms-handler-feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - SMS Management Feature</name>
     <url>http://entgra.io</url>
+
     <modules>
-        <module>io.entgra.sms.mgt.server.feature</module>
-        <module>io.entgra.sms.mgt.api.feature</module>
+        <module>io.entgra.transport.mgt.sms.handler.server.feature</module>
+        <module>io.entgra.transport.mgt.sms.handler.api.feature</module>
     </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 9276f0c579..7bb19f9f1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <module>components/webapp-authenticator-framework</module>
         <module>components/email-sender</module>
         <module>components/ui-request-interceptor</module>
-        <module>components/sms-mgt</module>
+        <module>components/transport-mgt</module>
         <module>features/device-mgt</module>
         <module>features/apimgt-extensions</module>
         <module>features/application-mgt</module>
@@ -59,7 +59,7 @@
         <module>features/ui-request-interceptor</module>
         <module>features/jwt-client</module>
 	    <module>features/device-mgt-extensions</module>
-        <module>features/sms-mgt</module>
+        <module>features/transport-mgt</module>
     </modules>
 
     <dependencyManagement>
@@ -387,12 +387,12 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>io.entgra.sms.mgt.core</artifactId>
+                <artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>io.entgra.sms.mgt.common</artifactId>
+                <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <!-- Device Management dependencies -->