diff --git a/platform/framework/src/Main.js b/platform/framework/src/Main.js
index 0ec4f78198..e767b4070a 100644
--- a/platform/framework/src/Main.js
+++ b/platform/framework/src/Main.js
@@ -19,13 +19,13 @@ define(
         '../lib/angular-route.min',
         './Constants',
         './FrameworkInitializer',
-        './BundleLoader',
-        './ImplementationLoader',
-        './ExtensionResolver',
-        './BundleResolver',
-        './CustomRegistrars',
-        './ExtensionRegistrar',
-        './ApplicationBootstrapper'
+        './load/BundleLoader',
+        './resolve/ImplementationLoader',
+        './resolve/ExtensionResolver',
+        './resolve/BundleResolver',
+        './register/CustomRegistrars',
+        './register/ExtensionRegistrar',
+        './bootstrap/ApplicationBootstrapper'
     ],
     function (require,
               es6promise,
diff --git a/platform/framework/src/ApplicationBootstrapper.js b/platform/framework/src/bootstrap/ApplicationBootstrapper.js
similarity index 100%
rename from platform/framework/src/ApplicationBootstrapper.js
rename to platform/framework/src/bootstrap/ApplicationBootstrapper.js
diff --git a/platform/framework/src/Bundle.js b/platform/framework/src/load/Bundle.js
similarity index 99%
rename from platform/framework/src/Bundle.js
rename to platform/framework/src/load/Bundle.js
index 8f8e244d2d..dc10e09949 100644
--- a/platform/framework/src/Bundle.js
+++ b/platform/framework/src/load/Bundle.js
@@ -1,7 +1,7 @@
 /*global define*/
 
 define(
-    ['./Constants', './Extension'],
+    ['../Constants', './Extension'],
     function (Constants, Extension) {
         "use strict";
 
diff --git a/platform/framework/src/BundleLoader.js b/platform/framework/src/load/BundleLoader.js
similarity index 99%
rename from platform/framework/src/BundleLoader.js
rename to platform/framework/src/load/BundleLoader.js
index f6d7b0f0c6..1d760e097d 100644
--- a/platform/framework/src/BundleLoader.js
+++ b/platform/framework/src/load/BundleLoader.js
@@ -4,7 +4,7 @@
  * Module defining BundleLoader.js. Created by vwoeltje on 10/31/14.
  */
 define(
-    ['./Constants', './Bundle'],
+    ['../Constants', './Bundle'],
     function (Constants, Bundle) {
         "use strict";
 
diff --git a/platform/framework/src/Extension.js b/platform/framework/src/load/Extension.js
similarity index 100%
rename from platform/framework/src/Extension.js
rename to platform/framework/src/load/Extension.js
diff --git a/platform/framework/src/CustomRegistrars.js b/platform/framework/src/register/CustomRegistrars.js
similarity index 99%
rename from platform/framework/src/CustomRegistrars.js
rename to platform/framework/src/register/CustomRegistrars.js
index 516c755152..f44f2de8db 100644
--- a/platform/framework/src/CustomRegistrars.js
+++ b/platform/framework/src/register/CustomRegistrars.js
@@ -4,7 +4,7 @@
  * Module defining CustomRegistrars. Created by vwoeltje on 11/3/14.
  */
 define(
-    ['./Constants'],
+    ['../Constants'],
     function (Constants) {
         "use strict";
 
diff --git a/platform/framework/src/ExtensionRegistrar.js b/platform/framework/src/register/ExtensionRegistrar.js
similarity index 99%
rename from platform/framework/src/ExtensionRegistrar.js
rename to platform/framework/src/register/ExtensionRegistrar.js
index 8a527fdf88..3d471dcdfd 100644
--- a/platform/framework/src/ExtensionRegistrar.js
+++ b/platform/framework/src/register/ExtensionRegistrar.js
@@ -4,7 +4,7 @@
  * Module defining ExtensionRegistrar. Created by vwoeltje on 11/3/14.
  */
 define(
-    ['./Constants', './PartialConstructor'],
+    ['../Constants', './PartialConstructor'],
     function (Constants, PartialConstructor) {
         "use strict";
 
diff --git a/platform/framework/src/PartialConstructor.js b/platform/framework/src/register/PartialConstructor.js
similarity index 100%
rename from platform/framework/src/PartialConstructor.js
rename to platform/framework/src/register/PartialConstructor.js
diff --git a/platform/framework/src/BundleResolver.js b/platform/framework/src/resolve/BundleResolver.js
similarity index 100%
rename from platform/framework/src/BundleResolver.js
rename to platform/framework/src/resolve/BundleResolver.js
diff --git a/platform/framework/src/ExtensionResolver.js b/platform/framework/src/resolve/ExtensionResolver.js
similarity index 100%
rename from platform/framework/src/ExtensionResolver.js
rename to platform/framework/src/resolve/ExtensionResolver.js
diff --git a/platform/framework/src/ImplementationLoader.js b/platform/framework/src/resolve/ImplementationLoader.js
similarity index 100%
rename from platform/framework/src/ImplementationLoader.js
rename to platform/framework/src/resolve/ImplementationLoader.js