diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index 35fae3de9b..fca0e2cf72 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -9,12 +9,12 @@
         "controllers": [
             {
                 "key": "EditController",
-                "implementation": "EditController.js",
+                "implementation": "controllers/EditController.js",
                 "depends": [ "$scope", "navigationService" ]
             },
             {
                 "key": "EditActionController",
-                "implementation": "EditActionController.js",
+                "implementation": "controllers/EditActionController.js",
                 "depends": [ "$scope" ]
             },
             {
@@ -97,7 +97,7 @@
         ],
         "representers": [
             {
-                "implementation": "EditRepresenter.js",
+                "implementation": "representers/EditRepresenter.js",
                 "depends": [ "$q", "$log" ]
             },
             {
diff --git a/platform/commonUI/edit/src/EditActionController.js b/platform/commonUI/edit/src/controllers/EditActionController.js
similarity index 100%
rename from platform/commonUI/edit/src/EditActionController.js
rename to platform/commonUI/edit/src/controllers/EditActionController.js
diff --git a/platform/commonUI/edit/src/EditController.js b/platform/commonUI/edit/src/controllers/EditController.js
similarity index 96%
rename from platform/commonUI/edit/src/EditController.js
rename to platform/commonUI/edit/src/controllers/EditController.js
index 8c859ab126..cf07797429 100644
--- a/platform/commonUI/edit/src/EditController.js
+++ b/platform/commonUI/edit/src/controllers/EditController.js
@@ -4,7 +4,7 @@
  * Module defining EditController. Created by vwoeltje on 11/14/14.
  */
 define(
-    ["./objects/EditableDomainObject"],
+    ["../objects/EditableDomainObject"],
     function (EditableDomainObject) {
         "use strict";
 
diff --git a/platform/commonUI/edit/src/EditRepresenter.js b/platform/commonUI/edit/src/representers/EditRepresenter.js
similarity index 100%
rename from platform/commonUI/edit/src/EditRepresenter.js
rename to platform/commonUI/edit/src/representers/EditRepresenter.js
diff --git a/platform/commonUI/edit/test/EditActionControllerSpec.js b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
similarity index 96%
rename from platform/commonUI/edit/test/EditActionControllerSpec.js
rename to platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
index e0e23cada8..13369872af 100644
--- a/platform/commonUI/edit/test/EditActionControllerSpec.js
+++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
@@ -1,7 +1,7 @@
 /*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
-    ["../src/EditActionController"],
+    ["../../src/controllers/EditActionController"],
     function (EditActionController) {
         "use strict";
 
diff --git a/platform/commonUI/edit/test/EditControllerSpec.js b/platform/commonUI/edit/test/controllers/EditControllerSpec.js
similarity index 98%
rename from platform/commonUI/edit/test/EditControllerSpec.js
rename to platform/commonUI/edit/test/controllers/EditControllerSpec.js
index 3dff5f7ed8..f945c499b8 100644
--- a/platform/commonUI/edit/test/EditControllerSpec.js
+++ b/platform/commonUI/edit/test/controllers/EditControllerSpec.js
@@ -1,7 +1,7 @@
 /*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
-    ["../src/EditController"],
+    ["../../src/controllers/EditController"],
     function (EditController) {
         "use strict";
 
diff --git a/platform/commonUI/edit/test/EditRepresenterSpec.js b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js
similarity index 98%
rename from platform/commonUI/edit/test/EditRepresenterSpec.js
rename to platform/commonUI/edit/test/representers/EditRepresenterSpec.js
index 85d314fda6..1a11cb12bc 100644
--- a/platform/commonUI/edit/test/EditRepresenterSpec.js
+++ b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js
@@ -1,7 +1,7 @@
 /*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
-    ["../src/EditRepresenter"],
+    ["../../src/representers/EditRepresenter"],
     function (EditRepresenter) {
         "use strict";
 
diff --git a/platform/commonUI/edit/test/suite.json b/platform/commonUI/edit/test/suite.json
index 94e077e242..f3ace073eb 100644
--- a/platform/commonUI/edit/test/suite.json
+++ b/platform/commonUI/edit/test/suite.json
@@ -1,7 +1,4 @@
 [
-    "EditActionController",
-    "EditController",
-    "EditRepresenter",
     "actions/CancelAction",
     "actions/EditAction",
     "actions/PropertiesAction",
@@ -13,10 +10,13 @@
     "capabilities/EditableLookupCapability",
     "capabilities/EditablePersistenceCapability",
     "capabilities/EditorCapability",
+    "controllers/EditActionController",
+    "controllers/EditController",
     "controllers/EditPanesController",
     "objects/EditableDomainObject",
     "objects/EditableDomainObjectCache",
     "objects/EditableModelCache",
+    "representers/EditRepresenter",
     "representers/EditToolbar",
     "representers/EditToolbarRepresenter"
 ]
\ No newline at end of file