diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index c99ac0c2d..5f3811b83 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -7,7 +7,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
-    const:jsFiles="Main.app.js, Common.js"
+    const:jsFiles="Main.js, Common.js"
     >
   <!--
       MAIN CONTENT ROW
diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 266895c53..cd24d53d5 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -1,14 +1,15 @@
 module.exports = function(grunt) {
   var js_files = {
     'js/Common.js': ['js/Common/Common.app.js', 'js/Common/*.filter.js', 'js/Common/*Controller.js', 'js/Common/*.service.js', 'js/Common/*.directive.js', 'js/Common/utils.js'],
+    'js/Main.js': ['js/Main/Main.app.js'],
     'js/Scheduler.services.js': ['js/Scheduler/*.service.js'],
-    'js/Scheduler.js': ['js/Scheduler.app.js', 'js/Scheduler/*Controller.js', 'js/Scheduler/*.directive.js'],
+    'js/Scheduler.js': ['js/Scheduler/Scheduler.app.js', 'js/Scheduler/*Controller.js', 'js/Scheduler/*.directive.js'],
     'js/Contacts.services.js': ['js/Contacts/*.service.js'],
-    'js/Contacts.js': ['js/Contacts.app.js', 'js/Contacts/*Controller.js', 'js/Contacts/*.directive.js'],
+    'js/Contacts.js': ['js/Contacts/Contacts.app.js', 'js/Contacts/*Controller.js', 'js/Contacts/*.directive.js'],
     'js/Mailer.services.js': ['js/Mailer/*.service.js'],
-    'js/Mailer.js': ['js/Mailer.app.js', 'js/Mailer/*Controller.js', 'js/Mailer/*.directive.js'],
+    'js/Mailer.js': ['js/Mailer/Mailer.app.js', 'js/Mailer/*Controller.js', 'js/Mailer/*.directive.js'],
     'js/Preferences.services.js': ['js/Preferences/*.service.js'],
-    'js/Preferences.js': ['js/Preferences.app.js', 'js/Preferences/*Controller.js']
+    'js/Preferences.js': ['js/Preferences/Preferences.app.js', 'js/Preferences/*Controller.js']
   };
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
diff --git a/UI/WebServerResources/js/Contacts.app.js b/UI/WebServerResources/js/Contacts/Contacts.app.js
similarity index 100%
rename from UI/WebServerResources/js/Contacts.app.js
rename to UI/WebServerResources/js/Contacts/Contacts.app.js
diff --git a/UI/WebServerResources/js/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
similarity index 100%
rename from UI/WebServerResources/js/Mailer.app.js
rename to UI/WebServerResources/js/Mailer/Mailer.app.js
diff --git a/UI/WebServerResources/js/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
similarity index 100%
rename from UI/WebServerResources/js/Main.app.js
rename to UI/WebServerResources/js/Main/Main.app.js
diff --git a/UI/WebServerResources/js/Preferences.app.js b/UI/WebServerResources/js/Preferences/Preferences.app.js
similarity index 100%
rename from UI/WebServerResources/js/Preferences.app.js
rename to UI/WebServerResources/js/Preferences/Preferences.app.js
diff --git a/UI/WebServerResources/js/Scheduler.app.js b/UI/WebServerResources/js/Scheduler/Scheduler.app.js
similarity index 100%
rename from UI/WebServerResources/js/Scheduler.app.js
rename to UI/WebServerResources/js/Scheduler/Scheduler.app.js