diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js
index 8a694c57a7..443660cc8b 100644
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -24,23 +24,14 @@ define([
     "./src/BrowseController",
     "./src/PaneController",
     "./src/BrowseObjectController",
-    "./src/creation/CreateMenuController",
-    "./src/creation/LocatorController",
     "./src/MenuArrowController",
     "./src/navigation/NavigationService",
-    "./src/creation/CreationPolicy",
     "./src/navigation/NavigateAction",
     "./src/windowing/NewTabAction",
     "./src/windowing/FullscreenAction",
-    "./src/creation/CreateActionProvider",
-    "./src/creation/AddActionProvider",
-    "./src/creation/CreationService",
     "./src/windowing/WindowTitler",
     "text!./res/templates/browse.html",
-    "text!./res/templates/create/locator.html",
     "text!./res/templates/browse-object.html",
-    "text!./res/templates/create/create-button.html",
-    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/items/grid-item.html",
     "text!./res/templates/browse/object-header.html",
     "text!./res/templates/menu-arrow.html",
@@ -53,23 +44,14 @@ define([
     BrowseController,
     PaneController,
     BrowseObjectController,
-    CreateMenuController,
-    LocatorController,
     MenuArrowController,
     NavigationService,
-    CreationPolicy,
     NavigateAction,
     NewTabAction,
     FullscreenAction,
-    CreateActionProvider,
-    AddActionProvider,
-    CreationService,
     WindowTitler,
     browseTemplate,
-    locatorTemplate,
     browseObjectTemplate,
-    createButtonTemplate,
-    createMenuTemplate,
     gridItemTemplate,
     objectHeaderTemplate,
     menuArrowTemplate,
@@ -136,22 +118,6 @@ define([
                         "$route"
                     ]
                 },
-                {
-                    "key": "CreateMenuController",
-                    "implementation": CreateMenuController,
-                    "depends": [
-                        "$scope"
-                    ]
-                },
-                {
-                    "key": "LocatorController",
-                    "implementation": LocatorController,
-                    "depends": [
-                        "$scope",
-                        "$timeout",
-                        "objectService"
-                    ]
-                },
                 {
                     "key": "MenuArrowController",
                     "implementation": MenuArrowController,
@@ -160,12 +126,6 @@ define([
                     ]
                 }
             ],
-            "controls": [
-                {
-                    "key": "locator",
-                    "template": locatorTemplate
-                }
-            ],
             "representations": [
                 {
                     "key": "view-object",
@@ -181,17 +141,6 @@ define([
                         "view"
                     ]
                 },
-                {
-                    "key": "create-button",
-                    "template": createButtonTemplate
-                },
-                {
-                    "key": "create-menu",
-                    "template": createMenuTemplate,
-                    "uses": [
-                        "action"
-                    ]
-                },
                 {
                     "key": "grid-item",
                     "template": gridItemTemplate,
@@ -244,12 +193,6 @@ define([
                     "implementation": NavigationService
                 }
             ],
-            "policies": [
-                {
-                    "implementation": CreationPolicy,
-                    "category": "creation"
-                }
-            ],
             "actions": [
                 {
                     "key": "navigate",
@@ -302,40 +245,6 @@ define([
                     "editable": false
                 }
             ],
-            "components": [
-                {
-                    "key": "CreateActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": CreateActionProvider,
-                    "depends": [
-                        "typeService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "AddActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": AddActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "dialogService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "CreationService",
-                    "provides": "creationService",
-                    "type": "provider",
-                    "implementation": CreationService,
-                    "depends": [
-                        "$q",
-                        "$log"
-                    ]
-                }
-            ],
             "runs": [
                 {
                     "implementation": WindowTitler,
diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js
index 527c6b60a1..5107329bfb 100644
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -43,6 +43,15 @@ define([
     "./src/capabilities/EditorCapability",
     "./src/capabilities/TransactionCapabilityDecorator",
     "./src/services/TransactionService",
+    "./src/creation/CreateMenuController",
+    "./src/creation/LocatorController",
+    "./src/creation/CreationPolicy",
+    "./src/creation/CreateActionProvider",
+    "./src/creation/AddActionProvider",
+    "./src/creation/CreationService",
+    "text!./res/templates/create/locator.html",
+    "text!./res/templates/create/create-button.html",
+    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/library.html",
     "text!./res/templates/edit-object.html",
     "text!./res/templates/edit-action-buttons.html",
@@ -72,6 +81,15 @@ define([
     EditorCapability,
     TransactionCapabilityDecorator,
     TransactionService,
+    CreateMenuController,
+    LocatorController,
+    CreationPolicy,
+    CreateActionProvider,
+    AddActionProvider,
+    CreationService,
+    locatorTemplate,
+    createButtonTemplate,
+    createMenuTemplate,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -112,7 +130,23 @@ define([
                         "$location",
                         "policyService"
                     ]
-                }
+                },
+                {
+                    "key": "CreateMenuController",
+                    "implementation": CreateMenuController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "LocatorController",
+                    "implementation": LocatorController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "objectService"
+                    ]
+                },
             ],
             "directives": [
                 {
@@ -221,8 +255,11 @@ define([
                     "category": "navigation",
                     "message": "There are unsaved changes.",
                     "implementation": EditNavigationPolicy
+                },
+                {
+                    "implementation": CreationPolicy,
+                    "category": "creation"
                 }
-
             ],
             "templates": [
                 {
@@ -261,7 +298,18 @@ define([
                 {
                     "key": "topbar-edit",
                     "template": topbarEditTemplate
-                }
+                },
+                {
+                    "key": "create-button",
+                    "template": createButtonTemplate
+                },
+                {
+                    "key": "create-menu",
+                    "template": createMenuTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                },
             ],
             "components": [
                 {
@@ -282,7 +330,40 @@ define([
                         "$q",
                         "$log"
                     ]
+                },
+                {
+                    "key": "CreateActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": CreateActionProvider,
+                    "depends": [
+                        "typeService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "AddActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": AddActionProvider,
+                    "depends": [
+                        "$q",
+                        "typeService",
+                        "dialogService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "CreationService",
+                    "provides": "creationService",
+                    "type": "provider",
+                    "implementation": CreationService,
+                    "depends": [
+                        "$q",
+                        "$log"
+                    ]
                 }
+
             ],
             "representers": [
                 {
@@ -316,6 +397,12 @@ define([
                         "transactionService"
                     ]
                 }
+            ],
+            "controls": [
+                {
+                    "key": "locator",
+                    "template": locatorTemplate
+                }
             ]
         }
     });
diff --git a/platform/commonUI/browse/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html
similarity index 100%
rename from platform/commonUI/browse/res/templates/create/create-button.html
rename to platform/commonUI/edit/res/templates/create/create-button.html
diff --git a/platform/commonUI/browse/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html
similarity index 100%
rename from platform/commonUI/browse/res/templates/create/create-menu.html
rename to platform/commonUI/edit/res/templates/create/create-menu.html
diff --git a/platform/commonUI/browse/res/templates/create/locator.html b/platform/commonUI/edit/res/templates/create/locator.html
similarity index 100%
rename from platform/commonUI/browse/res/templates/create/locator.html
rename to platform/commonUI/edit/res/templates/create/locator.html
diff --git a/platform/commonUI/edit/src/actions/SaveAsAction.js b/platform/commonUI/edit/src/actions/SaveAsAction.js
index 05a9fe7918..cee67ebbfe 100644
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@@ -22,7 +22,7 @@
 
 
 define(
-    ['../../../browse/src/creation/CreateWizard'],
+    ['../creation/CreateWizard'],
     function (CreateWizard) {
 
         /**
diff --git a/platform/commonUI/browse/src/creation/AddAction.js b/platform/commonUI/edit/src/creation/AddAction.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/AddAction.js
rename to platform/commonUI/edit/src/creation/AddAction.js
diff --git a/platform/commonUI/browse/src/creation/AddActionProvider.js b/platform/commonUI/edit/src/creation/AddActionProvider.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/AddActionProvider.js
rename to platform/commonUI/edit/src/creation/AddActionProvider.js
diff --git a/platform/commonUI/browse/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreateAction.js
rename to platform/commonUI/edit/src/creation/CreateAction.js
diff --git a/platform/commonUI/browse/src/creation/CreateActionProvider.js b/platform/commonUI/edit/src/creation/CreateActionProvider.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreateActionProvider.js
rename to platform/commonUI/edit/src/creation/CreateActionProvider.js
diff --git a/platform/commonUI/browse/src/creation/CreateMenuController.js b/platform/commonUI/edit/src/creation/CreateMenuController.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreateMenuController.js
rename to platform/commonUI/edit/src/creation/CreateMenuController.js
diff --git a/platform/commonUI/browse/src/creation/CreateWizard.js b/platform/commonUI/edit/src/creation/CreateWizard.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreateWizard.js
rename to platform/commonUI/edit/src/creation/CreateWizard.js
diff --git a/platform/commonUI/browse/src/creation/CreationPolicy.js b/platform/commonUI/edit/src/creation/CreationPolicy.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreationPolicy.js
rename to platform/commonUI/edit/src/creation/CreationPolicy.js
diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/edit/src/creation/CreationService.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/CreationService.js
rename to platform/commonUI/edit/src/creation/CreationService.js
diff --git a/platform/commonUI/browse/src/creation/LocatorController.js b/platform/commonUI/edit/src/creation/LocatorController.js
similarity index 100%
rename from platform/commonUI/browse/src/creation/LocatorController.js
rename to platform/commonUI/edit/src/creation/LocatorController.js
diff --git a/platform/commonUI/browse/test/creation/AddActionProviderSpec.js b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/AddActionProviderSpec.js
rename to platform/commonUI/edit/test/creation/AddActionProviderSpec.js
diff --git a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreateActionProviderSpec.js
rename to platform/commonUI/edit/test/creation/CreateActionProviderSpec.js
diff --git a/platform/commonUI/browse/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreateActionSpec.js
rename to platform/commonUI/edit/test/creation/CreateActionSpec.js
diff --git a/platform/commonUI/browse/test/creation/CreateMenuControllerSpec.js b/platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreateMenuControllerSpec.js
rename to platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js
diff --git a/platform/commonUI/browse/test/creation/CreateWizardSpec.js b/platform/commonUI/edit/test/creation/CreateWizardSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreateWizardSpec.js
rename to platform/commonUI/edit/test/creation/CreateWizardSpec.js
diff --git a/platform/commonUI/browse/test/creation/CreationPolicySpec.js b/platform/commonUI/edit/test/creation/CreationPolicySpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreationPolicySpec.js
rename to platform/commonUI/edit/test/creation/CreationPolicySpec.js
diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/edit/test/creation/CreationServiceSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/CreationServiceSpec.js
rename to platform/commonUI/edit/test/creation/CreationServiceSpec.js
diff --git a/platform/commonUI/browse/test/creation/LocatorControllerSpec.js b/platform/commonUI/edit/test/creation/LocatorControllerSpec.js
similarity index 100%
rename from platform/commonUI/browse/test/creation/LocatorControllerSpec.js
rename to platform/commonUI/edit/test/creation/LocatorControllerSpec.js