diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
index 7ca07cf8a9..5efc9b61e5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs
@@ -38,5 +38,103 @@
 {{/zone}}
 
 {{#zone "content"}}
-    {{unit "cdmf.unit.role.create"}}
+    <!-- content/body -->
+    <div class="row">
+        <div class="col-md-12">
+            <!-- content -->
+            <div id="role-create-form" class="container col-centered wr-content">
+                <div class="wr-form">
+                    <p class="page-sub-title">Add Role</p>
+                    <hr />
+                    <div class="row">
+                        <div class="col-lg-8">
+                            <div class="wr-steps">
+                                <div class="col-md-6 col-xs-6">
+                                    <div class="itm-wiz itm-wiz-current" data-step="policy-platform">
+                                        <div class="wiz-no">1</div>
+                                        <div class="wiz-lbl hidden-xs"><span>Add a role</span></div>
+                                    </div>
+                                </div>
+                                <div class="col-md-6 col-xs-6">
+                                    <div class="itm-wiz" data-step="policy-profile">
+                                        <div class="wiz-no">2</div>
+                                        <div class="wiz-lbl hidden-xs"><span>Assign permissions</span></div>
+                                    </div>
+                                </div>
+                                <br class="c-both" />
+                            </div>
+                            <br /><br />
+                            <hr />
+                            <div id="role-create-error-msg" class="alert alert-danger hidden" role="alert">
+                                <i class="icon fw fw-error"></i><span></span>
+                            </div>
+                            <label class="wr-input-label">User Store Domain</label>
+                            <div class="wr-input-control">
+                                <!--suppress HtmlFormInputWithoutLabel -->
+                                <select id="domain" class="form-control select">
+                                    <option>PRIMARY</option>
+                                    {{#each userStores}}
+                                        <option>{{this}}</option>
+                                    {{/each}}
+                                </select>
+                            </div>
+
+                            <label class="wr-input-label">
+                                Role Name *
+                            </label>
+                            <br>
+                            <label class="wr-input-label">
+                                ( {{roleNameHelpText}} )
+                            </label>
+
+                            <div id="roleNameField" class="form-group wr-input-control">
+                                <!--suppress HtmlFormInputWithoutLabel -->
+                                <input type="text" id="roleName" data-regex="{{roleNameJSRegEx}}"
+                                       data-error-msg="{{roleNameRegExViolationErrorMsg}}" class="form-control" />
+                                <span class="roleNameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
+                                <label class="error roleNameEmpty hidden" for="summary">
+                                    Role name is required, should be in minimum 3 characters long and not include any whitespaces.
+                                </label>
+                            </div>
+                            <label class="wr-input-label">
+                                User list
+                            </label>
+
+                            <div class="wr-input-control">
+                                <!--suppress HtmlFormInputWithoutLabel -->
+                                <select id="users" class="form-control select2" multiple="multiple"></select>
+                            </div>
+                        </div>
+                    </div>
+                    <br>
+                    <button id="add-role-btn" class="wr-btn">Add Role</button>
+                </div>
+            </div>
+            <div id="role-created-msg" class="container col-centered wr-content hidden">
+                <div class="wr-form">
+                    <p class="page-sub-title">Role was added successfully.</p>
+                    <br>Please click <b>"Add Another Role"</b>, if you wish to add another role or click
+                    <b>"View Role List"</b> to complete the process and go back to the role list.
+                    <hr />
+                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
+                        View Role List
+                    </button>
+                    <!--suppress HtmlUnknownTarget -->
+                    <a href="{{@app.context}}/role/add" class="cu-btn-inner">
+                        <span class="fw-stack">
+                            <i class="fw fw-ring fw-stack-2x"></i>
+                            <i class="fw fw-add fw-stack-1x"></i>
+                        </span>
+                        Add Another Role
+                    </a>
+                </div>
+            </div>
+            <!-- /content -->
+            <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
+        </div>
+    </div>
+    <!-- /content/body -->
+{{/zone}}
+{{#zone "bottomJs"}}
+    {{js "js/bottomJs.js"}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
similarity index 99%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
index 6b839df433..909a3ee303 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.js
@@ -18,7 +18,7 @@
 
 /**
  * Returns the dynamic state to be populated by add-user page.
- *
+ * 
  * @param context Object that gets updated with the dynamic state of this page to be presented
  * @returns {*} A context object that returns the dynamic state of this page to be presented
  */
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs
deleted file mode 100644
index ade597fede..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs
+++ /dev/null
@@ -1,118 +0,0 @@
-{{!
-  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-
-  WSO2 Inc. licenses this file to you under the Apache License,
-  Version 2.0 (the "License"); you may not use this file except
-  in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
-}}
-
-<!-- content/body -->
-<div class="row">
-    <div class="col-md-12">
-        <!-- content -->
-        <div id="role-create-form" class="container col-centered wr-content">
-            <div class="wr-form">
-                <p class="page-sub-title">Add Role</p>
-                <hr />
-                <div class="row">
-                    <div class="col-lg-8">
-                        <div class="wr-steps">
-                            <div class="col-md-6 col-xs-6">
-                                <div class="itm-wiz itm-wiz-current" data-step="policy-platform">
-                                    <div class="wiz-no">1</div>
-                                    <div class="wiz-lbl hidden-xs"><span>Add a role</span></div>
-                                </div>
-                            </div>
-                            <div class="col-md-6 col-xs-6">
-                                <div class="itm-wiz" data-step="policy-profile">
-                                    <div class="wiz-no">2</div>
-                                    <div class="wiz-lbl hidden-xs"><span>Assign permissions</span></div>
-                                </div>
-                            </div>
-                            <br class="c-both" />
-                        </div>
-                        <br /><br />
-                        <hr />
-                        <div id="role-create-error-msg" class="alert alert-danger hidden" role="alert">
-                            <i class="icon fw fw-error"></i><span></span>
-                        </div>
-                        <label class="wr-input-label">User Store Domain</label>
-                        <div class="wr-input-control">
-                            <!--suppress HtmlFormInputWithoutLabel -->
-                            <select id="domain" class="form-control select">
-                                <option>PRIMARY</option>
-                                {{#each userStores}}
-                                    <option>{{this}}</option>
-                                {{/each}}
-                            </select>
-                        </div>
-
-                        <label class="wr-input-label">
-                            Role Name *
-                        </label>
-                        <br>
-                        <label class="wr-input-label">
-                            ( {{roleNameHelpText}} )
-                        </label>
-
-                        <div id="roleNameField" class="form-group wr-input-control">
-                            <!--suppress HtmlFormInputWithoutLabel -->
-                            <input type="text" id="roleName" data-regex="{{roleNameJSRegEx}}"
-                                   data-error-msg="{{roleNameRegExViolationErrorMsg}}" class="form-control" />
-                            <span class="roleNameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
-                            <label class="error roleNameEmpty hidden" for="summary">
-                                Role name is required, should be in minimum 3 characters long and not include any whitespaces.
-                            </label>
-                        </div>
-                        <label class="wr-input-label">
-                            User list
-                        </label>
-
-                        <div class="wr-input-control">
-                            <!--suppress HtmlFormInputWithoutLabel -->
-                            <select id="users" class="form-control select2" multiple="multiple"></select>
-                        </div>
-                    </div>
-                </div>
-                <br>
-                <button id="add-role-btn" class="wr-btn">Add Role</button>
-            </div>
-        </div>
-        <div id="role-created-msg" class="container col-centered wr-content hidden">
-            <div class="wr-form">
-                <p class="page-sub-title">Role was added successfully.</p>
-                <br>Please click <b>"Add Another Role"</b>, if you wish to add another role or click
-                <b>"View Role List"</b> to complete the process and go back to the role list.
-                <hr />
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
-                    View Role List
-                </button>
-                <!--suppress HtmlUnknownTarget -->
-                <a href="{{@app.context}}/role/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-ring fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                    Add Another Role
-                </a>
-            </div>
-        </div>
-        <!-- /content -->
-        <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
-    </div>
-</div>
-<!-- /content/body -->
-{{#zone "bottomJs"}}
-    {{js "js/bottomJs.js"}}
-{{/zone}}
-
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.json
deleted file mode 100644
index 9eecd8f5bf..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "version": "1.0.0"
-}
\ No newline at end of file