diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 56f6fd79fa1..9fd1737a827 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -71,7 +71,8 @@
                             org.wso2.carbon.registry.core.exceptions,
                             org.wso2.carbon.registry.core.service,
                             org.wso2.carbon.registry.core.session,
-                            org.w3c.dom
+                            org.w3c.dom,
+                            org.wso2.carbon.email.verification.util
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java
index 21c9379bae0..bc7a51db487 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java
@@ -22,6 +22,7 @@ package org.wso2.carbon.device.mgt.core.internal;
 import org.wso2.carbon.device.mgt.core.DeviceManager;
 import org.wso2.carbon.device.mgt.core.config.license.LicenseConfig;
 import org.wso2.carbon.device.mgt.core.license.mgt.LicenseManager;
+import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
@@ -35,6 +36,15 @@ public class DeviceManagementDataHolder {
     private RegistryService registryService;
     private LicenseConfig licenseConfig;
 
+    public static EmailVerifcationSubscriber getEmailVerificationSubscriber() {
+        return emailVerificationSubscriber;
+    }
+
+    public static void setEmailVerificationSubscriber(EmailVerifcationSubscriber emailVerificationSubscriber) {
+        DeviceManagementDataHolder.emailVerificationSubscriber = emailVerificationSubscriber;
+    }
+
+    private static EmailVerifcationSubscriber emailVerificationSubscriber;
     private static DeviceManagementDataHolder thisInstance = new DeviceManagementDataHolder();
 
     private DeviceManagementDataHolder() {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
index 979323200e5..332eaaa3fa2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
@@ -40,6 +40,7 @@ import org.wso2.carbon.device.mgt.core.license.mgt.LicenseManager;
 import org.wso2.carbon.device.mgt.core.license.mgt.LicenseManagerImpl;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagementSchemaInitializer;
+import org.wso2.carbon.email.verification.util.EmailVerifcationSubscriber;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -227,7 +228,7 @@ public class DeviceManagementServiceComponent {
 	 */
 	protected void unsetRegistryService(RegistryService registryService) {
 		if (log.isDebugEnabled()) {
-			log.debug("Unsetting Registry Service");
+			log.debug("Un setting Registry Service");
 		}
 		DeviceManagementDataHolder.getInstance().setRegistryService(null);
 	}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
index fd4a4421640..7660a0124b9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
@@ -39,6 +39,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+
 public final class DeviceManagerUtil {
 
 	private static final Log log = LogFactory.getLog(DeviceManagerUtil.class);
@@ -147,4 +148,8 @@ public final class DeviceManagerUtil {
 		return propertiesMap;
 	}
 
+    public static void sendEmail(){
+
+    }
+
 }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index 41b5933cf7c..cd603ae9c91 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -32,7 +32,7 @@
     <version>0.9.2-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for Back-end Devvice Management functionality
+    <description>This feature contains the core bundles required for Back-end Device Management functionality
     </description>
 
     <dependencies>
diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
index d09ae350bbe..9e0f8ba3bbf 100644
--- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
+++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
@@ -33,7 +33,7 @@
     <version>0.9.2-SNAPSHOT</version>
     <name>WSO2 Carbon - Policy Management Server Feature</name>
     <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for Back-end Devvice Management functionality
+    <description>This feature contains the core bundles required for Back-end Device Management functionality
     </description>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 4c213f5c97b..3814ec8daf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,10 @@
     <modules>
         <module>components/device-mgt</module>
         <module>components/policy-mgt</module>
+        <module>components/user-mgt</module>
         <module>features/device-mgt</module>
         <module>features/policy-mgt</module>
+        <module>features/user-mgt</module>
     </modules>
 
     <dependencyManagement>
@@ -75,6 +77,21 @@
                 <artifactId>org.wso2.carbon.policy.information.point</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.user.core</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.user.common</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.user.common</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <!-- Device Management dependencies -->
 
             <!-- Governance dependencies -->
@@ -591,9 +608,6 @@
         <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
         <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
 
-        <!-- Carbon Commons -->
-        <carbon.commons.version>4.3.4</carbon.commons.version>
-
         <!-- Carbon Deployment -->
         <carbon.deployment.version>4.3.1</carbon.deployment.version>