diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index d03210f60..8a8567dc5 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -28,26 +28,34 @@ function newAppLoader () {
 
         'Globals.js',
         'Ecosystem.js',
-          'MQService',
+        'MQService',
 
-          'ChartsSpace/ChartUtilities.js',
-          'ChartsSpace/PlottersManager.js',
-          'ChartsSpace/TimelineChart.js',
-          'ChartsSpace/TimeMachine.js',
-          'ChartsSpace/ViewPort.js',
-          'ChartsSpace/TimeLineCoordinateSystem.js',
+        'ChartsSpace/ChartUtilities.js',
+        'ChartsSpace/PlottersManager.js',
+        'ChartsSpace/TimelineChart.js',
+        'ChartsSpace/TimeMachine.js',
+        'ChartsSpace/ViewPort.js',
+        'ChartsSpace/TimeLineCoordinateSystem.js',
 
         'TopSpace/CurrentEvent.js',
         'TopSpace/EndUser.js',
         'TopSpace/Login.js',
 
         'StrategySpace/StrategizerGateway.js',
-        'StrategySpace/Workspace.js',
+        
         'StrategySpace/ConstGetStrategies.js',
         'StrategySpace/ConstNewStrategy.js',
         'StrategySpace/ConstUpdateStrategy.js',
         'StrategySpace/ConstDeleteStrategy.js',
 
+        'StrategySpace/Workspace/Workspace.js',
+        'StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js',
+        'StrategySpace/Workspace/FunctionLibraries/AttachDetach.js',
+        'StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js',
+        'StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js',
+          'StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js',
+                                                     
+
         'Utilities/RoundedCornersBackground.js',
 
         'Panels/TimeControlPanel.js',
diff --git a/server.js b/server.js
index f8c4d9294..8c7ce9eb9 100644
--- a/server.js
+++ b/server.js
@@ -468,8 +468,19 @@ function onBrowserRequest (request, response) {
       break
 
     case 'StrategySpace': // This means the StrategySpace folder.
-        {
-              respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2], response)
+          {     
+              if (requestParameters[3] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2], response)
+                  return
+              }
+              if (requestParameters[4] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] , response)
+                  return
+              }
+              if (requestParameters[5] === undefined) {
+                  respondWithFile(serverConfig.pathToCanvasApp + '/StrategySpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
+                  return
+              }              
         }
         break