diff --git a/Project.njsproj b/Project.njsproj
index 44f1a4295..c5e492d07 100644
--- a/Project.njsproj
+++ b/Project.njsproj
@@ -41,13 +41,11 @@
     </Compile>
     <Compile Include="Scripts\require.js" />
     <Compile Include="server.js" />
-    <Compile Include="Server\FileCloud.js" />
     <Content Include=".env" />
     <Content Include="index.html" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Scripts\" />
-    <Folder Include="Server\" />
   </ItemGroup>
   <!-- Do not delete the following Import Project.  While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them. -->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />
diff --git a/Scripts/AppLoader.js b/WebServer/AppLoader.js
similarity index 100%
rename from Scripts/AppLoader.js
rename to WebServer/AppLoader.js
diff --git a/Scripts/AppPreLoader.js b/WebServer/AppPreLoader.js
similarity index 98%
rename from Scripts/AppPreLoader.js
rename to WebServer/AppPreLoader.js
index 17da86bdc..2e150a408 100644
--- a/Scripts/AppPreLoader.js
+++ b/WebServer/AppPreLoader.js
@@ -127,7 +127,7 @@ function loadSuperalgos() {
 
             if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadModules -> Entering function."); }
 
-            let path = window.canvasApp.urlPrefix + "Scripts/AppLoader.js";
+            let path = window.canvasApp.urlPrefix + "WebServer/AppLoader.js";
 
             REQUIREJS([path], onRequired);
 
diff --git a/Scripts/require.js b/WebServer/require.js
similarity index 100%
rename from Scripts/require.js
rename to WebServer/require.js
diff --git a/index.html b/index.html
index f70ea60e7..40277d726 100644
--- a/index.html
+++ b/index.html
@@ -16,8 +16,8 @@
           integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
     <link rel="shortcut icon" type="image/png/ico" href="Images/favicon.ico" />
 
-    <script type="text/javascript" src="Scripts/require.js"></script>
-    <script type="text/javascript" src="Scripts/AppPreLoader.js"></script>
+    <script type="text/javascript" src="WebServer/require.js"></script>
+    <script type="text/javascript" src="WebServer/AppPreLoader.js"></script>
     <script src="externalScripts/CCapture.all.min.js"></script>
 
     <script type="text/javascript">
diff --git a/server.js b/server.js
index 45fc2ebfd..68a8ebadc 100644
--- a/server.js
+++ b/server.js
@@ -277,7 +277,7 @@ function onBrowserRequest (request, response) {
       }
       break
 
-    case 'Images': // This means the Scripts folder.
+    case 'Images': // This means the Images folder.
       {
         let path = process.env.PATH_TO_WEB_SERVER  +  'Images/' + requestParameters[2]
 
@@ -347,13 +347,13 @@ function onBrowserRequest (request, response) {
       }
       break
 
-    case 'Scripts': // This means the Scripts folder.
+    case 'WebServer': // This means the WebServer folder.
       {
-        respondWithFile(process.env.PATH_TO_WEB_SERVER +  'Scripts/' + requestParameters[2], response)
+        respondWithFile(process.env.PATH_TO_WEB_SERVER +  'WebServer/' + requestParameters[2], response)
       }
       break
 
-    case 'externalScripts': // This means the Scripts folder.
+    case 'externalScripts': // This means the WebServer folder.
         {
               respondWithFile(process.env.PATH_TO_WEB_SERVER + 'externalScripts/' + requestParameters[2], response)
         }