diff --git a/modules/calendar/Calendar.css b/css/calendar/Calendar.css
similarity index 100%
rename from modules/calendar/Calendar.css
rename to css/calendar/Calendar.css
diff --git a/careersPage.css b/css/careersPage.css
similarity index 97%
rename from careersPage.css
rename to css/careersPage.css
index 59ed0db37..8e6f2873f 100755
--- a/careersPage.css
+++ b/css/careersPage.css
@@ -1,60 +1,60 @@
-@charset "utf-8";
-/* CATS Applicant Tracking System Careers Page
-Released: 11.13.2007
-Created By: Sae Vang
- */
-
-/* COMMON */
-body, html { margin: 0; padding: 0; background: #ffffff; font: normal 12px/14px Arial, Helvetica, sans-serif; color: #000000; }
-#container { margin: 0 auto; padding: 0; width: 930px; height: auto; }
-#logo { float: left; margin: 0; }
-	#logo img { width: 424px; height: 103px; }
-#actions { float: right; margin: 0; width: 310px; height: 100px; background: #efefef; border: 1px solid #cccccc; }
-	#actions img { float: left; margin: 2px 6px 2px 15px; width: 130px; height: 25px; }
-#footer { clear: both; margin: 20px auto 0 auto; width: 150px; }
-	#footer img { width: 137px; height: 38px; }
-
-a:link, a:active { color: #1763b9; }
-a:hover { color: #c75a01; }
-a:visited { color: #333333; }
-
-h1 { margin: 0 0 10px 0; font: bold 18px Arial, Helvetica, sans-serif; }
-h2 { margin: 8px 0 8px 15px; font: bold 14px Arial, Helvetica, sans-serif; }
-h3 { margin: 0; font: bold 14px Arial, Helvetica, sans-serif; }
-p { font: normal 12px Arial, Helvetica, sans-serif; }
-img { border: none; }
-strong { font-weight: bold; }
-em { font-style: italics; }
-
-
-/* CONTENTS ON PAGE SPECS */
-#careerContent { clear: both; padding: 15px 0 0 0; }
-
-/* DISPLAY ALL JOBS PAGE */
-#displayTable { width: 930px; }
-#displayTable tr.header { background: #e0e0e0; border: 1px solid #cccccc; border-left: none; border-right: none; }
-#displayTable tr.odd { background: #ffffff; }
-#displayTable tr.even { background: #ebebeb; }
-#displayTable td { padding: 5px; }
-	
-/* DISPLAY JOB DETAILS */
-#detailsTable { width: 400px; }
-	#detailsTable td.detailsHeader { width: 30%; }
-div#discriptive { float: left; width: 585px; }
-div#detailsTools { float: right; width: 330px; height: 70px; background: #ffffff; border: 1px solid #cccccc; }
-	div#detailsTools img { float: left; margin: 2px 6px 5px 15px;  }
-
-/* DISPLAY APPLICATION FORM */
-div.applyBoxLeft, div.applyBoxRight { width: 450px; height: 470px; background: #f9f9f9; border: 1px solid #cccccc; border-top: none; }
-div.applyBoxLeft { float: left; margin: 0 10px 30px 0; }
-div.applyBoxRight { float: right; margin: 0 0 30px 10px; }
-	div.applyBoxLeft div, div.applyBoxRight div { margin: 0 0 5px 0; padding: 3px 10px; background: #efefef; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; }
-	div.applyBoxLeft table, div.applyBoxRight table { margin: 0 auto; width: 420px; }
-	div.applyBoxLeft table td, div.applyBoxRight table td { padding: 3px; vertical-align: top; }
-		td.label { text-align: right; width: 110px; }
-	label { font-weight: bold; }
-	input#documentFile { width: 342px; }
-	input.inputbox { width: 285px; height: 15px; }
-	input.submitbutton { float: right; width: 195px; height: 25px; }
-	textarea { margin: 8px 0 0 0; width: 410px; height: 170px; }
+@charset "utf-8";
+/* CATS Applicant Tracking System Careers Page
+Released: 11.13.2007
+Created By: Sae Vang
+ */
+
+/* COMMON */
+body, html { margin: 0; padding: 0; background: #ffffff; font: normal 12px/14px Arial, Helvetica, sans-serif; color: #000000; }
+#container { margin: 0 auto; padding: 0; width: 930px; height: auto; }
+#logo { float: left; margin: 0; }
+	#logo img { width: 424px; height: 103px; }
+#actions { float: right; margin: 0; width: 310px; height: 100px; background: #efefef; border: 1px solid #cccccc; }
+	#actions img { float: left; margin: 2px 6px 2px 15px; width: 130px; height: 25px; }
+#footer { clear: both; margin: 20px auto 0 auto; width: 150px; }
+	#footer img { width: 137px; height: 38px; }
+
+a:link, a:active { color: #1763b9; }
+a:hover { color: #c75a01; }
+a:visited { color: #333333; }
+
+h1 { margin: 0 0 10px 0; font: bold 18px Arial, Helvetica, sans-serif; }
+h2 { margin: 8px 0 8px 15px; font: bold 14px Arial, Helvetica, sans-serif; }
+h3 { margin: 0; font: bold 14px Arial, Helvetica, sans-serif; }
+p { font: normal 12px Arial, Helvetica, sans-serif; }
+img { border: none; }
+strong { font-weight: bold; }
+em { font-style: italics; }
+
+
+/* CONTENTS ON PAGE SPECS */
+#careerContent { clear: both; padding: 15px 0 0 0; }
+
+/* DISPLAY ALL JOBS PAGE */
+#displayTable { width: 930px; }
+#displayTable tr.header { background: #e0e0e0; border: 1px solid #cccccc; border-left: none; border-right: none; }
+#displayTable tr.odd { background: #ffffff; }
+#displayTable tr.even { background: #ebebeb; }
+#displayTable td { padding: 5px; }
+	
+/* DISPLAY JOB DETAILS */
+#detailsTable { width: 400px; }
+	#detailsTable td.detailsHeader { width: 30%; }
+div#discriptive { float: left; width: 585px; }
+div#detailsTools { float: right; width: 330px; height: 70px; background: #ffffff; border: 1px solid #cccccc; }
+	div#detailsTools img { float: left; margin: 2px 6px 5px 15px;  }
+
+/* DISPLAY APPLICATION FORM */
+div.applyBoxLeft, div.applyBoxRight { width: 450px; height: 470px; background: #f9f9f9; border: 1px solid #cccccc; border-top: none; }
+div.applyBoxLeft { float: left; margin: 0 10px 30px 0; }
+div.applyBoxRight { float: right; margin: 0 0 30px 10px; }
+	div.applyBoxLeft div, div.applyBoxRight div { margin: 0 0 5px 0; padding: 3px 10px; background: #efefef; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; }
+	div.applyBoxLeft table, div.applyBoxRight table { margin: 0 auto; width: 420px; }
+	div.applyBoxLeft table td, div.applyBoxRight table td { padding: 3px; vertical-align: top; }
+		td.label { text-align: right; width: 110px; }
+	label { font-weight: bold; }
+	input#documentFile { width: 342px; }
+	input.inputbox { width: 285px; height: 15px; }
+	input.submitbutton { float: right; width: 195px; height: 25px; }
+	textarea { margin: 8px 0 0 0; width: 410px; height: 170px; }
 	textarea.inputboxlarge { width: 285px; height: 70px; }
\ No newline at end of file
diff --git a/ie.css b/css/ie.css
similarity index 100%
rename from ie.css
rename to css/ie.css
diff --git a/modules/import/MassImport.css b/css/import/MassImport.css
similarity index 97%
rename from modules/import/MassImport.css
rename to css/import/MassImport.css
index 81c329f28..2f10f6e27 100755
--- a/modules/import/MassImport.css
+++ b/css/import/MassImport.css
@@ -27,7 +27,7 @@ td.softMiddle {
 }
 #statusBar {
     height: 31px;
-    background: #6B94F2 url(images/parser/statusBar.jpg);
+    background: #6B94F2 url(../../images/parser/statusBar.jpg);
     width: 1px;
 }
 div.stepContainer {
diff --git a/modules/install/install.css b/css/install/install.css
similarity index 98%
rename from modules/install/install.css
rename to css/install/install.css
index a5877b8d2..200c2360c 100755
--- a/modules/install/install.css
+++ b/css/install/install.css
@@ -199,7 +199,7 @@ p.success
      */
     background-color: transparent !important;
     background-color: #333;
-    /* background-image\**\: url('images/maskBG.gif') !important; */
+    /* background-image\**\: url('../../images/maskBG.gif') !important; */
     background-image: none;
     background-repeat: repeat;
     display: none;
diff --git a/modules/login/login.css b/css/login/login.css
similarity index 98%
rename from modules/login/login.css
rename to css/login/login.css
index bde9da055..3819a8dea 100755
--- a/modules/login/login.css
+++ b/css/login/login.css
@@ -229,7 +229,7 @@ div.clear
      */
     background-color: transparent !important;
     background-color: #333;
-    /* background-image\**\: url('images/maskBG.gif') !important; */
+    /* background-image\**\: url('../../images/maskBG.gif') !important; */
     background-image: none;
     background-repeat: repeat;
     display: none;
diff --git a/main.css b/css/main.css
similarity index 95%
rename from main.css
rename to css/main.css
index b806329e8..4cb2b6a94 100755
--- a/main.css
+++ b/css/main.css
@@ -158,7 +158,7 @@ a:hover
 /* Inactive Tab */
 #header ul#primary a.inactive
 {
-    background: #E2E2E2 url(images/tabs/inactive.jpg) no-repeat;
+    background: #E2E2E2 url(../images/tabs/inactive.jpg) no-repeat;
     height: 21px;
     width: 81px;
     margin: 3px 3px 0px 0px; /* 1px more margin-left than a.active. */
@@ -181,7 +181,7 @@ a:hover
 /* Active Tab */
 #header ul#primary a.active
 {
-    background: #E2E2E2 url(images/tabs/active.jpg) no-repeat;
+    background: #E2E2E2 url(../images/tabs/active.jpg) no-repeat;
     height: 24px;
     width: 81px;
     margin: 1px 2px 0px 0px;
@@ -259,7 +259,7 @@ a:hover
     margin: 0px 0px 0px 0px;
     padding: 5px 10px 5px 0px;
     background: #fff;
-    background-image: url('images/mru_background.gif');
+    background-image: url('../images/mru_background.gif');
     background-repeat: repeat-x;
     text-align: right;
 }
@@ -287,7 +287,7 @@ a:hover
     font: normal normal normal 12px Arial, Tahoma, sans-serif;
     color: #000;
     background: #fff;
-    background-image: url('images/mru_background.gif');
+    background-image: url('../images/mru_background.gif');
     background-repeat: repeat-x;
 
 }
@@ -331,7 +331,7 @@ a:hover
     padding: 0px 0px 0px 0px;
     float: left;
     background-color: transparent;
-    background: url('images/cats_icon.gif') no-repeat center;
+    background: url('../images/cats_icon.gif') no-repeat center;
     width: 55px;
     height: 55px;
 }
@@ -386,7 +386,7 @@ a:hover
 
 p.note
 {
-    background-image: url('images/bgBlue.gif');
+    background-image: url('../images/bgBlue.gif');
     background-repeat: repeat-x;
     padding: 4px;
     margin-top: 0px;
@@ -400,7 +400,7 @@ p.note
 
 p.noteUnsized
 {
-    background-image: url('images/bgBlue.gif');
+    background-image: url('../images/bgBlue.gif');
     background-repeat: repeat-x;
     padding: 4px;
     margin-top: 0px;
@@ -413,7 +413,7 @@ p.noteUnsized
 
 .noteUnsizedSpan
 {
-    background-image: url('images/bgBlue.gif');
+    background-image: url('../images/bgBlue.gif');
     background-repeat: repeat-x;
     padding: 4px;
     margin-top: 0px;
@@ -426,7 +426,7 @@ p.noteUnsized
 
 p.warning
 {
-    background-image: url('images/orange_gradient.jpg');
+    background-image: url('../images/orange_gradient.jpg');
     background-repeat: repeat-x;
     padding: 4px;
     margin-top: 0px;
@@ -440,7 +440,7 @@ p.warning
 
 p.perror
 {
-    background-image: url('images/red_gradient.jpg');
+    background-image: url('../images/red_gradient.jpg');
     background-repeat: repeat-x;
     padding: 4px;
     margin-top: 0px;
@@ -513,7 +513,7 @@ table.notsortable th
     border-left: none;
     border-right: none;
     padding: 2px 4px 2px 4px;
-    background-image: url('images/sort_table_bg.gif');
+    background-image: url('../images/sort_table_bg.gif');
     color: #000080;
     font: normal normal bold 12px Arial, Tahoma, sans-serif;
 }
@@ -579,7 +579,7 @@ table.statisticsTable th
     border-left: none;
     border-right: none;
     padding: 2px 4px 2px 4px;
-    background-image: url('images/sort_table_bg.gif');
+    background-image: url('../images/sort_table_bg.gif');
     color: #000080;
     font: normal normal bold 12px Arial, Tahoma, sans-serif;
 }
@@ -620,7 +620,7 @@ tr.evenTableRow-onmouseover
 
 .editTable
 {
-    background: url('images/bgGrayForm.gif');
+    background: url('../images/bgGrayForm.gif');
     background-repeat: repeat-x;
     background-position: top;
     background-color: #f4f4f4;
@@ -756,7 +756,7 @@ p.freeformbottom
   font-size: 12px;
   padding-left: 8px;
   padding-right: 8px;
-  background: url('images/button_bg.gif') repeat-x #f0f0f0;
+  background: url('../images/button_bg.gif') repeat-x #f0f0f0;
   border: 1px solid #a4a4a4;
 }
 
@@ -772,7 +772,7 @@ p.freeformbottom
   font-size: 12px;
   padding-left: 8px;
   padding-right: 8px;
-  background: url('images/button_bg_down.gif') repeat-x #f0f0f0;
+  background: url('../images/button_bg_down.gif') repeat-x #f0f0f0;
   border: 1px solid #a4a4a4;
 }
 
@@ -783,7 +783,7 @@ p.freeformbottom
   font-size: 12px;
   padding-left: 8px;
   padding-right: 8px;
-  background: url('images/button_bg.gif') repeat-x #f0f0f0;
+  background: url('../images/button_bg.gif') repeat-x #f0f0f0;
   border: 1px solid #a4a4a4;
 }
 
@@ -794,7 +794,7 @@ p.freeformbottom
   font-size: 12px;
   padding-left: 8px;
   padding-right: 8px;
-  background: url('images/button_bg_down.gif') repeat-x #f0f0f0;
+  background: url('../images/button_bg_down.gif') repeat-x #f0f0f0;
   border: 1px solid #a4a4a4;
 }
 
@@ -944,7 +944,7 @@ span.validationError
      */
     background-color: transparent !important;
     background-color: #333;
-    /* background-image\**\: url('images/maskBG.gif') !important; */
+    /* background-image\**\: url('../images/maskBG.gif') !important; */
     background-image: none;
     background-repeat: repeat;
     display: none;
@@ -1188,7 +1188,7 @@ input.selectAll
     line-height: normal;
     font-size-adjust: none;
     font-stretch: normal;
-    background-image: url('images/lightblue_gradient_15.jpg');
+    background-image: url('../images/lightblue_gradient_15.jpg');
     background-repeat: repeat;
     background-attachment: scroll;
     color: white;
diff --git a/not-ie.css b/css/not-ie.css
similarity index 100%
rename from not-ie.css
rename to css/not-ie.css
diff --git a/modules/settings/downloads.css b/css/settings/downloads.css
similarity index 98%
rename from modules/settings/downloads.css
rename to css/settings/downloads.css
index e68bd8080..597383c81 100755
--- a/modules/settings/downloads.css
+++ b/css/settings/downloads.css
@@ -1,9 +1,9 @@
-/* Downloads Supported Types > Settings tab > Downloads */
-
-#settingsDownloads {  clear: both; width: 600px; }
-#settingsDownloads h4 { margin: 15px 0 0 0;font: bold 14px Arial, sans-serif; color: #000; }
-table.downloadSupportedGrid { margin: 0 0 15px 0; padding: 0; border: 1px solid #ccc; border-left: none; text-align: left; width: 600px; }
-table.downloadSupportedGrid tr.headers { background: #f3e1d2; }
-table.downloadSupportedGrid tr.headers span { vertical-align: super;  }
-table.downloadSupportedGrid td { padding: 0 0 0 10px; border-left: 1px solid #ccc; height: 25px; }
+/* Downloads Supported Types > Settings tab > Downloads */
+
+#settingsDownloads {  clear: both; width: 600px; }
+#settingsDownloads h4 { margin: 15px 0 0 0;font: bold 14px Arial, sans-serif; color: #000; }
+table.downloadSupportedGrid { margin: 0 0 15px 0; padding: 0; border: 1px solid #ccc; border-left: none; text-align: left; width: 600px; }
+table.downloadSupportedGrid tr.headers { background: #f3e1d2; }
+table.downloadSupportedGrid tr.headers span { vertical-align: super;  }
+table.downloadSupportedGrid td { padding: 0 0 0 10px; border-left: 1px solid #ccc; height: 25px; }
 table.downloadSupportedGrid td.category { width: 125px; font: normal 14px Arial, sans-serif; text-align: left; }
\ No newline at end of file
diff --git a/modules/tests/tests.css b/css/tests/tests.css
similarity index 100%
rename from modules/tests/tests.css
rename to css/tests/tests.css
diff --git a/modules/wizard/style.css b/css/wizard/style.css
similarity index 95%
rename from modules/wizard/style.css
rename to css/wizard/style.css
index f154562d2..691974435 100755
--- a/modules/wizard/style.css
+++ b/css/wizard/style.css
@@ -9,7 +9,7 @@ td.wizardBody { font-size: 14px; background-color: #DDE2FF; color: #ffffff; heig
 td.sectionTitle { background-color: #FFDE90; padding: 10px; font-size: 12px; font-weight: bold; }
 td.sectionTitleCurrent { background-color: #FFB400; padding: 10px; font-size: 12px; font-weight: bold; }
 input.button { height: 20px; color: #333; font-size: 12px; padding-left: 8px; padding-right: 8px;
-    background: url('images/button_bg.gif') repeat-x #f0f0f0; border: 1px solid #a4a4a4; cursor: pointer; }
+    background: url('../../images/button_bg.gif') repeat-x #f0f0f0; border: 1px solid #a4a4a4; cursor: pointer; }
 #loadingBar { position: absolute; width: 650px; text-align: center; top: 25%; padding: 10px;
     left: 18%; border: 5px solid #e0e0e0; background-color: #f0f0f0; font-size: 38px; font-weight: bold;
     color: #666666; visibility: hidden; }
diff --git a/installtest.php b/installtest.php
index 6e98dde1b..5176faec6 100755
--- a/installtest.php
+++ b/installtest.php
@@ -45,7 +45,7 @@
 <html>
     <head>
         <title>CATS - Installation Test Script</title>
-        <style type="text/css" media="all">@import "main.css";</style>
+        <style type="text/css" media="all">@import "css/main.css";</style>
         <style type="text/css" media="all">
             table.test_output
             {
diff --git a/installwizard.php b/installwizard.php
index 911d5fd39..916346d97 100755
--- a/installwizard.php
+++ b/installwizard.php
@@ -26,7 +26,7 @@
         <script type="text/javascript" src="js/lib.js"></script>
         <script type="text/javascript" src="js/install.js"></script>
         <script type="text/javascript" src="js/submodal/subModal.js"></script>
-        <style type="text/css" media="all">@import "modules/install/install.css";</style>
+        <style type="text/css" media="all">@import "css/install/install.css";</style>
     </head>
 
     <body>
diff --git a/modules/activity/validator.js b/js/activity/validator.js
similarity index 100%
rename from modules/activity/validator.js
rename to js/activity/validator.js
diff --git a/modules/calendar/Calendar.js b/js/calendar/Calendar.js
similarity index 100%
rename from modules/calendar/Calendar.js
rename to js/calendar/Calendar.js
diff --git a/modules/calendar/CalendarUI.js b/js/calendar/CalendarUI.js
similarity index 100%
rename from modules/calendar/CalendarUI.js
rename to js/calendar/CalendarUI.js
diff --git a/modules/calendar/validator.js b/js/calendar/validator.js
similarity index 100%
rename from modules/calendar/validator.js
rename to js/calendar/validator.js
diff --git a/modules/candidates/activityvalidator.js b/js/candidates/activityvalidator.js
similarity index 100%
rename from modules/candidates/activityvalidator.js
rename to js/candidates/activityvalidator.js
diff --git a/modules/candidates/quickAction-candidates.js b/js/candidates/quickAction.js
similarity index 100%
rename from modules/candidates/quickAction-candidates.js
rename to js/candidates/quickAction.js
diff --git a/modules/candidates/validator.js b/js/candidates/validator.js
similarity index 100%
rename from modules/candidates/validator.js
rename to js/candidates/validator.js
diff --git a/modules/companies/validator.js b/js/companies/validator.js
similarity index 100%
rename from modules/companies/validator.js
rename to js/companies/validator.js
diff --git a/modules/contacts/validator.js b/js/contacts/validator.js
similarity index 100%
rename from modules/contacts/validator.js
rename to js/contacts/validator.js
diff --git a/modules/import/import.js b/js/import/import.js
similarity index 100%
rename from modules/import/import.js
rename to js/import/import.js
diff --git a/modules/joborders/validator.js b/js/joborders/validator.js
similarity index 100%
rename from modules/joborders/validator.js
rename to js/joborders/validator.js
diff --git a/modules/login/validator.js b/js/login/validator.js
similarity index 100%
rename from modules/login/validator.js
rename to js/login/validator.js
diff --git a/modules/settings/Settings.js b/js/settings/Settings.js
similarity index 100%
rename from modules/settings/Settings.js
rename to js/settings/Settings.js
diff --git a/modules/settings/validator.js b/js/settings/validator.js
similarity index 100%
rename from modules/settings/validator.js
rename to js/settings/validator.js
diff --git a/js/submodal/loading.html b/js/submodal/loading.html
index 5871fbce4..28ae5801f 100755
--- a/js/submodal/loading.html
+++ b/js/submodal/loading.html
@@ -4,7 +4,7 @@
     <head>
         <title>Loading...</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <style type="text/css" media="all">@import "../../main.css";</style>
+        <style type="text/css" media="all">@import "../../css/main.css";</style>
     </head>
 
     <body>
diff --git a/modules/tests/validator.js b/js/tests/validator.js
similarity index 100%
rename from modules/tests/validator.js
rename to js/tests/validator.js
diff --git a/modules/toolbar/toolbarlibForLegacy.js b/js/toolbar/toolbarlibForLegacy.js
similarity index 100%
rename from modules/toolbar/toolbarlibForLegacy.js
rename to js/toolbar/toolbarlibForLegacy.js
diff --git a/modules/wizard/wizard.js b/js/wizard/wizard.js
similarity index 100%
rename from modules/wizard/wizard.js
rename to js/wizard/wizard.js
diff --git a/lib/TemplateUtility.php b/lib/TemplateUtility.php
index 396019a64..8a6fecde2 100755
--- a/lib/TemplateUtility.php
+++ b/lib/TemplateUtility.php
@@ -1194,7 +1194,7 @@ private static function _printCommonHeader($pageTitle, $headIncludes = array())
         echo '<script type="text/javascript" src="js/jquery-1.3.2.min.js'.$javascriptAntiCache.'"></script>', "\n";
         echo '<script type="text/javascript">CATSIndexName = "'.CATSUtility::getIndexName().'";</script>', "\n";
 
-       $headIncludes[] = 'main.css';
+       $headIncludes[] = 'css/main.css';
 
         foreach ($headIncludes as $key => $filename)
         {
@@ -1212,8 +1212,8 @@ private static function _printCommonHeader($pageTitle, $headIncludes = array())
             }
         }
 
-        echo '<!--[if IE]><link rel="stylesheet" type="text/css" href="ie.css" /><![endif]-->', "\n";
-        echo '<![if !IE]><link rel="stylesheet" type="text/css" href="not-ie.css" /><![endif]>', "\n";
+        echo '<!--[if IE]><link rel="stylesheet" type="text/css" href="css/ie.css" /><![endif]-->', "\n";
+        echo '<![if !IE]><link rel="stylesheet" type="text/css" href="css/not-ie.css" /><![endif]>', "\n";
         echo '</head>', "\n\n";
     }
 
diff --git a/modules/activity/Search.tpl b/modules/activity/Search.tpl
index 00cdc2aad..77688aa50 100755
--- a/modules/activity/Search.tpl
+++ b/modules/activity/Search.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Search.tpl 1948 2007-02-23 09:49:27Z will $ */ ?>
-<?php TemplateUtility::printHeader('Activities', array('js/highlightrows.js', 'modules/activity/validator.js', 'js/sweetTitles.js')); ?>
+<?php TemplateUtility::printHeader('Activities', array('js/highlightrows.js', 'js/activity/validator.js', 'js/sweetTitles.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/calendar/Calendar.tpl b/modules/calendar/Calendar.tpl
index b382162d2..68916b2e5 100755
--- a/modules/calendar/Calendar.tpl
+++ b/modules/calendar/Calendar.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Calendar.tpl 3221 2007-10-17 17:13:22Z will $ */ ?>
-<?php TemplateUtility::printHeader('Calendar', array('modules/calendar/Calendar.css', 'js/highlightrows.js', 'modules/calendar/Calendar.js', 'modules/calendar/CalendarUI.js', 'modules/calendar/validator.js')); ?>
+<?php TemplateUtility::printHeader('Calendar', array('css/calendar/Calendar.css', 'js/highlightrows.js', 'js/calendar/Calendar.js', 'js/calendar/CalendarUI.js', 'js/calendar/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/candidates/Add.tpl b/modules/candidates/Add.tpl
index c190cbf69..c2c22c91f 100755
--- a/modules/candidates/Add.tpl
+++ b/modules/candidates/Add.tpl
@@ -1,8 +1,8 @@
 <?php /* $Id: Add.tpl 3746 2007-11-28 20:28:21Z andrew $ */ ?>
 <?php if ($this->isModal): ?>
-    <?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/validator.js', 'js/addressParser.js', 'js/listEditor.js',  'js/candidate.js', 'js/candidateParser.js'), 'Add New Candidate to This Job Order Pipeline'); ?>
+    <?php TemplateUtility::printModalHeader('Candidates', array('js/candidates/validator.js', 'js/addressParser.js', 'js/listEditor.js',  'js/candidate.js', 'js/candidateParser.js'), 'Add New Candidate to This Job Order Pipeline'); ?>
 <?php else: ?>
-    <?php TemplateUtility::printHeader('Candidates', array('modules/candidates/validator.js', 'js/addressParser.js', 'js/listEditor.js',  'js/candidate.js', 'js/candidateParser.js')); ?>
+    <?php TemplateUtility::printHeader('Candidates', array('js/candidates/validator.js', 'js/addressParser.js', 'js/listEditor.js',  'js/candidate.js', 'js/candidateParser.js')); ?>
     <?php TemplateUtility::printHeaderBlock(); ?>
     <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
 
diff --git a/modules/candidates/AddActivityChangeStatusModal.tpl b/modules/candidates/AddActivityChangeStatusModal.tpl
index 804d55d20..1dd4a9776 100755
--- a/modules/candidates/AddActivityChangeStatusModal.tpl
+++ b/modules/candidates/AddActivityChangeStatusModal.tpl
@@ -1,10 +1,10 @@
 <?php /* $Id: AddActivityChangeStatusModal.tpl 3799 2007-12-04 17:54:36Z brian $ */ ?>
 <?php if ($this->isJobOrdersMode): ?>
-    <?php TemplateUtility::printModalHeader('Job Orders', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Job Orders: Log Activity'); ?>
+    <?php TemplateUtility::printModalHeader('Job Orders', array('js/candidates/activityvalidator.js', 'js/activity.js'), 'Job Orders: Log Activity'); ?>
 <?php elseif ($this->onlyScheduleEvent): ?>
-    <?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Schedule Event'); ?>
+    <?php TemplateUtility::printModalHeader('Candidates', array('js/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Schedule Event'); ?>
 <?php else: ?>
-    <?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Log Activity'); ?>
+    <?php TemplateUtility::printModalHeader('Candidates', array('js/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Log Activity'); ?>
 <?php endif; ?>
 
 <?php if (!$this->isFinishedMode): ?>
diff --git a/modules/candidates/CreateAttachmentModal.tpl b/modules/candidates/CreateAttachmentModal.tpl
index 06d99cc57..936c06a88 100755
--- a/modules/candidates/CreateAttachmentModal.tpl
+++ b/modules/candidates/CreateAttachmentModal.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CreateAttachmentModal.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/validator.js'), 'Create Candidate Attachment'); ?>
+<?php TemplateUtility::printModalHeader('Candidates', array('js/candidates/validator.js'), 'Create Candidate Attachment'); ?>
 
     <?php if (!$this->isFinishedMode){ ?>
         <form name="createAttachmentForm" id="createAttachmentForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=candidates&amp;a=createAttachment" enctype="multipart/form-data" method="post" onsubmit="return checkCreateAttachmentForm(document.createAttachmentForm);">
diff --git a/modules/candidates/CreateImageAttachmentModal.tpl b/modules/candidates/CreateImageAttachmentModal.tpl
index 9f2deb326..1ec76a7a9 100755
--- a/modules/candidates/CreateImageAttachmentModal.tpl
+++ b/modules/candidates/CreateImageAttachmentModal.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CreateImageAttachmentModal.tpl 2026 2007-02-27 22:34:05Z brian $ */ ?>
-<?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/validator.js')); ?>
+<?php TemplateUtility::printModalHeader('Candidates', array('js/candidates/validator.js')); ?>
     <p class="noteUnsized">Edit Profile Image</p>
 
     <?php if (!$this->isFinishedMode): ?>
diff --git a/modules/candidates/Edit.tpl b/modules/candidates/Edit.tpl
index e71fbae8a..baf3eb380 100755
--- a/modules/candidates/Edit.tpl
+++ b/modules/candidates/Edit.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Edit.tpl 3695 2007-11-26 22:01:04Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Candidates', array('modules/candidates/validator.js', 'js/sweetTitles.js', 'js/listEditor.js', 'js/doubleListEditor.js')); ?>
+<?php TemplateUtility::printHeader('Candidates', array('js/candidates/validator.js', 'js/sweetTitles.js', 'js/listEditor.js', 'js/doubleListEditor.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/candidates/Search.tpl b/modules/candidates/Search.tpl
index 0efbc6e58..522012575 100755
--- a/modules/candidates/Search.tpl
+++ b/modules/candidates/Search.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Search.tpl 3813 2007-12-05 23:16:22Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Candidates', array('modules/candidates/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
+<?php TemplateUtility::printHeader('Candidates', array('js/candidates/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/candidates/SendEmail.tpl b/modules/candidates/SendEmail.tpl
index 0dcf9bede..76b95954a 100755
--- a/modules/candidates/SendEmail.tpl
+++ b/modules/candidates/SendEmail.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: SendEmail.tpl 3078 2007-09-21 20:25:28Z will $ */ ?>
-<?php TemplateUtility::printHeader('Candidates', array('vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js', 'modules/candidates/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js', 'js/emailHandler.js')); ?>
+<?php TemplateUtility::printHeader('Candidates', array('vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js', 'js/candidates/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js', 'js/emailHandler.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/candidates/Show.tpl b/modules/candidates/Show.tpl
index 69356dfe6..e67df1bb4 100755
--- a/modules/candidates/Show.tpl
+++ b/modules/candidates/Show.tpl
@@ -4,9 +4,9 @@ use OpenCATS\UI\CandidateQuickActionMenu;
 use OpenCATS\UI\CandidateDuplicateQuickActionMenu;
 ?>
 <?php if ($this->isPopup): ?>
-    <?php TemplateUtility::printHeader('Candidate - '.$this->data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'modules/candidates/quickAction-candidates.js')); ?>
+    <?php TemplateUtility::printHeader('Candidate - '.$this->data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction.js')); ?>
 <?php else: ?>
-    <?php TemplateUtility::printHeader('Candidate - '.$this->data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'modules/candidates/quickAction-candidates.js', 'modules/candidates/quickAction-duplicates.js')); ?>
+    <?php TemplateUtility::printHeader('Candidate - '.$this->data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction-candidates.js', 'modules/candidates/quickAction-duplicates.js')); ?>
     
     <?php TemplateUtility::printHeaderBlock(); ?>
     <?php TemplateUtility::printTabs($this->active); ?>
diff --git a/modules/companies/Add.tpl b/modules/companies/Add.tpl
index 9487743af..689a8f283 100755
--- a/modules/companies/Add.tpl
+++ b/modules/companies/Add.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Add.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Companies', array('modules/companies/validator.js', 'js/sweetTitles.js', 'js/listEditor.js',  'js/addressParser.js')); ?>
+<?php TemplateUtility::printHeader('Companies', array('js/companies/validator.js', 'js/sweetTitles.js', 'js/listEditor.js',  'js/addressParser.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/companies/CreateAttachmentModal.tpl b/modules/companies/CreateAttachmentModal.tpl
index 12683b2df..1c71d750f 100755
--- a/modules/companies/CreateAttachmentModal.tpl
+++ b/modules/companies/CreateAttachmentModal.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CreateAttachmentModal.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printModalHeader('Companies', array('modules/companies/validator.js'), 'Create Company Attachment'); ?>
+<?php TemplateUtility::printModalHeader('Companies', array('js/companies/validator.js'), 'Create Company Attachment'); ?>
 
     <?php if (!$this->isFinishedMode): ?>
         <form name="createAttachmentForm" id="createAttachmentForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=companies&amp;a=createAttachment" enctype="multipart/form-data" method="post" onsubmit="return checkAttachmentForm(document.createAttachmentForm);">
diff --git a/modules/companies/Edit.tpl b/modules/companies/Edit.tpl
index 8ca6aba16..16e5f5d69 100755
--- a/modules/companies/Edit.tpl
+++ b/modules/companies/Edit.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Edit.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Companies', array('modules/companies/validator.js', 'js/sweetTitles.js', 'js/listEditor.js')); ?>
+<?php TemplateUtility::printHeader('Companies', array('js/companies/validator.js', 'js/sweetTitles.js', 'js/listEditor.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/companies/Search.tpl b/modules/companies/Search.tpl
index fe2af598c..f00695053 100755
--- a/modules/companies/Search.tpl
+++ b/modules/companies/Search.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Search.tpl 3676 2007-11-21 21:02:15Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Companies', array('modules/companies/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
+<?php TemplateUtility::printHeader('Companies', array('js/companies/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/contacts/Add.tpl b/modules/contacts/Add.tpl
index 6ca978ded..93cafef6c 100755
--- a/modules/contacts/Add.tpl
+++ b/modules/contacts/Add.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Add.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Contacts', array('modules/contacts/validator.js', 'js/company.js', 'js/sweetTitles.js', 'js/listEditor.js',  'js/contact.js', 'js/suggest.js')); ?>
+<?php TemplateUtility::printHeader('Contacts', array('js/contacts/validator.js', 'js/company.js', 'js/sweetTitles.js', 'js/listEditor.js',  'js/contact.js', 'js/suggest.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl
index c30144410..0ce8c29dd 100755
--- a/modules/contacts/AddActivityScheduleEventModal.tpl
+++ b/modules/contacts/AddActivityScheduleEventModal.tpl
@@ -1,9 +1,9 @@
 <?php /* $Id: AddActivityScheduleEventModal.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
 
 <?php if(!$this->onlyScheduleEvent): ?>
-<?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Log Activity'); ?>
+<?php TemplateUtility::printModalHeader('Contacts', array('js/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Log Activity'); ?>
 <?php else: ?>
-    <?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Schedule Event'); ?>
+    <?php TemplateUtility::printModalHeader('Contacts', array('js/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Schedule Event'); ?>
 <?php endif; ?>
 
 <?php if (!$this->isFinishedMode): ?>
diff --git a/modules/contacts/Edit.tpl b/modules/contacts/Edit.tpl
index 4e3963571..a05b46a7f 100755
--- a/modules/contacts/Edit.tpl
+++ b/modules/contacts/Edit.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Edit.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Contacts', array('modules/contacts/validator.js', 'js/sweetTitles.js', 'js/suggest.js', 'js/listEditor.js',  'js/contact.js', 'js/company.js')); ?>
+<?php TemplateUtility::printHeader('Contacts', array('js/contacts/validator.js', 'js/sweetTitles.js', 'js/suggest.js', 'js/listEditor.js',  'js/contact.js', 'js/company.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/contacts/Search.tpl b/modules/contacts/Search.tpl
index 07500ea88..b2f29b9af 100755
--- a/modules/contacts/Search.tpl
+++ b/modules/contacts/Search.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Search.tpl 3676 2007-11-21 21:02:15Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Contacts', array('modules/contacts/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
+<?php TemplateUtility::printHeader('Contacts', array('js/contacts/validator.js', 'js/searchSaved.js', 'js/sweetTitles.js', 'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/import/Import.tpl b/modules/import/Import.tpl
index 2f11668e1..116e1614b 100755
--- a/modules/import/Import.tpl
+++ b/modules/import/Import.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Import.tpl 3370 2007-11-01 16:43:07Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, '', 'settings'); ?>
     <div id="main">
diff --git a/modules/import/Import1.tpl b/modules/import/Import1.tpl
index 57d5a46d1..4aff5bd48 100755
--- a/modules/import/Import1.tpl
+++ b/modules/import/Import1.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Import1.tpl 3780 2007-12-03 21:13:56Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, '', 'settings'); ?>
     <div id="main">
diff --git a/modules/import/Import2.tpl b/modules/import/Import2.tpl
index 90d9c9d09..dfb0e14af 100755
--- a/modules/import/Import2.tpl
+++ b/modules/import/Import2.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Import2.tpl 3370 2007-11-01 16:43:07Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, '', 'settings'); ?>
     <div id="main">
diff --git a/modules/import/ImportCommits.tpl b/modules/import/ImportCommits.tpl
index a3121dda9..9fc17545d 100755
--- a/modules/import/ImportCommits.tpl
+++ b/modules/import/ImportCommits.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: ImportCommits.tpl 1543 2007-01-22 23:23:24Z will $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/import/ImportRecent.tpl b/modules/import/ImportRecent.tpl
index 24b1ab345..ae3548310 100755
--- a/modules/import/ImportRecent.tpl
+++ b/modules/import/ImportRecent.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: ImportRecent.tpl 3548 2007-11-09 23:54:52Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/import/ImportResumesBulk.tpl b/modules/import/ImportResumesBulk.tpl
index 516069edf..258b26d35 100755
--- a/modules/import/ImportResumesBulk.tpl
+++ b/modules/import/ImportResumesBulk.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: ImportResumesBulk.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Import', array('modules/import/import.js')); ?>
+<?php TemplateUtility::printHeader('Import', array('js/import/import.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, ''); ?>
     <div id="main">
diff --git a/modules/import/MassImport.tpl b/modules/import/MassImport.tpl
index 583dc4d36..0caf85870 100755
--- a/modules/import/MassImport.tpl
+++ b/modules/import/MassImport.tpl
@@ -2,7 +2,7 @@
 <?php TemplateUtility::printHeader('Settings', array('js/massImport.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, '', 'settings'); ?>
-<link rel="stylesheet" type="text/css" href="modules/import/MassImport.css" />
+<link rel="stylesheet" type="text/css" href="css/import/MassImport.css" />
     <div id="main">
         <div id="contents">
             <div style="width: 880px; padding: 15px;">
diff --git a/modules/import/MassImportEdit.tpl b/modules/import/MassImportEdit.tpl
index 6d447ef1c..6652ce249 100755
--- a/modules/import/MassImportEdit.tpl
+++ b/modules/import/MassImportEdit.tpl
@@ -3,7 +3,7 @@
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
 <script src='http://resfly.com/js/resumeParserValidation.js' type='text/javascript' language='javascript'></script>
-<link rel="stylesheet" type="text/css" href="modules/import/MassImport.css" />
+<link rel="stylesheet" type="text/css" href="css/import/MassImport.css" />
     <div id="main">
         <div id="contents">
             <div style="width: 910px; padding: 20px 5px 0 5px;">
diff --git a/modules/install/notinstalled.php b/modules/install/notinstalled.php
index f6700508b..ef3a2d05a 100755
--- a/modules/install/notinstalled.php
+++ b/modules/install/notinstalled.php
@@ -6,7 +6,7 @@
         <title>OpenCATS - Installation Wizard Script</title>
         <script type="text/javascript" src="js/lib.js"></script>
         <script type="text/javascript" src="js/install.js"></script>
-        <style type="text/css" media="all">@import "modules/install/install.css";</style>
+        <style type="text/css" media="all">@import "css/install/install.css";</style>
     </head>
 
     <body>
diff --git a/modules/install/phpVersion.php b/modules/install/phpVersion.php
index 7c17273ca..82344e89f 100755
--- a/modules/install/phpVersion.php
+++ b/modules/install/phpVersion.php
@@ -6,7 +6,7 @@
         <title>CATS - Installation Wizard Script</title>
         <script type="text/javascript" src="js/lib.js"></script>
         <script type="text/javascript" src="js/install.js"></script>
-        <style type="text/css" media="all">@import "modules/install/install.css";</style>
+        <style type="text/css" media="all">@import "css/install/install.css";</style>
     </head>
 
     <body>
diff --git a/modules/joborders/Add.tpl b/modules/joborders/Add.tpl
index fad263346..93b282485 100755
--- a/modules/joborders/Add.tpl
+++ b/modules/joborders/Add.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Add.tpl 3810 2007-12-05 19:13:25Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js',  'js/company.js', 'js/sweetTitles.js', 'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
+<?php TemplateUtility::printHeader('Job Orders', array('js/joborders/validator.js',  'js/company.js', 'js/sweetTitles.js', 'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/joborders/AddModalPopup.tpl b/modules/joborders/AddModalPopup.tpl
index 01cb43877..940cc97e0 100755
--- a/modules/joborders/AddModalPopup.tpl
+++ b/modules/joborders/AddModalPopup.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: AddModalPopup.tpl 3321 2007-10-25 22:03:10Z brian $ */ ?>
-<?php TemplateUtility::printModalHeader('Job Order', array('modules/joborders/validator.js')); ?>
+<?php TemplateUtility::printModalHeader('Job Order', array('js/joborders/validator.js')); ?>
     <table>
         <tr>
             <td width="3%">
diff --git a/modules/joborders/CreateAttachmentModal.tpl b/modules/joborders/CreateAttachmentModal.tpl
index 553274868..7328565ca 100755
--- a/modules/joborders/CreateAttachmentModal.tpl
+++ b/modules/joborders/CreateAttachmentModal.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CreateAttachmentModal.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-<?php TemplateUtility::printModalHeader('Job Order', array('modules/joborders/validator.js'), 'Create Job Order Attachment'); ?>
+<?php TemplateUtility::printModalHeader('Job Order', array('js/joborders/validator.js'), 'Create Job Order Attachment'); ?>
 
     <?php if (!$this->isFinishedMode): ?>
         <form name="createAttachmentForm" id="createAttachmentForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=joborders&amp;a=createAttachment" enctype="multipart/form-data" method="post" onsubmit="return checkAttachmentForm(document.createAttachmentForm);">
diff --git a/modules/joborders/Edit.tpl b/modules/joborders/Edit.tpl
index 45fe9a672..8804ef497 100755
--- a/modules/joborders/Edit.tpl
+++ b/modules/joborders/Edit.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Edit.tpl 3810 2007-12-05 19:13:25Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js',  'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
+<?php TemplateUtility::printHeader('Job Orders', array('js/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js',  'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
     <div id="main">
diff --git a/modules/joborders/Search.tpl b/modules/joborders/Search.tpl
index 1af97de07..b33c2583b 100755
--- a/modules/joborders/Search.tpl
+++ b/modules/joborders/Search.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Search.tpl 3676 2007-11-21 21:02:15Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js', 'js/sweetTitles.js',  'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js', 'js/searchSaved.js')); ?>
+<?php TemplateUtility::printHeader('Job Orders', array('js/joborders/validator.js', 'js/sweetTitles.js',  'js/searchAdvanced.js', 'js/highlightrows.js', 'js/export.js', 'js/searchSaved.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/login/ForgotPassword.tpl b/modules/login/ForgotPassword.tpl
index 72ab65706..2d923680c 100755
--- a/modules/login/ForgotPassword.tpl
+++ b/modules/login/ForgotPassword.tpl
@@ -5,9 +5,9 @@
     <head>
         <title>OpenCATS - Login</title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo(HTML_ENCODING); ?>">
-        <style type="text/css" media="all">@import "modules/login/login.css";</style>
+        <style type="text/css" media="all">@import "css/login/login.css";</style>
         <script type="text/javascript" src="js/lib.js"></script>
-        <script type="text/javascript" src="modules/login/validator.js"></script>
+        <script type="text/javascript" src="js/login/validator.js"></script>
     </head>
 
     <body>
diff --git a/modules/login/Login.tpl b/modules/login/Login.tpl
index 072312f17..470927d9f 100755
--- a/modules/login/Login.tpl
+++ b/modules/login/Login.tpl
@@ -5,9 +5,9 @@
     <head>
         <title>opencats - Login</title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo(HTML_ENCODING); ?>" />
-        <style type="text/css" media="all">@import "modules/login/login.css";</style>
+        <style type="text/css" media="all">@import "css/login/login.css";</style>
         <script type="text/javascript" src="js/lib.js"></script>
-        <script type="text/javascript" src="modules/login/validator.js"></script>
+        <script type="text/javascript" src="js/login/validator.js"></script>
         <script type="text/javascript" src="js/submodal/subModal.js"></script>
     </head>
 
diff --git a/modules/reports/EEOReport.tpl b/modules/reports/EEOReport.tpl
index 4391920bd..a90bb84b2 100755
--- a/modules/reports/EEOReport.tpl
+++ b/modules/reports/EEOReport.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: EEOReport.tpl 2441 2007-05-04 20:42:02Z brian $ */ ?>
-<?php TemplateUtility::printHeader('EEO Reports', array('modules/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js')); ?>
+<?php TemplateUtility::printHeader('EEO Reports', array('js/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/reports/GraphView.tpl b/modules/reports/GraphView.tpl
index 6fce1fc2b..fc41c36a3 100755
--- a/modules/reports/GraphView.tpl
+++ b/modules/reports/GraphView.tpl
@@ -8,7 +8,7 @@
         <link rel="icon" href="images/favicon.ico" type="image/x-icon" />
         <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo(CATSUtility::getIndexName()); ?>?m=rss&amp;siteID=<?php echo($_SESSION['CATS']->getSiteID()); ?>" />
-        <style type="text/css" media="all">@import "main.css";</style>
+        <style type="text/css" media="all">@import "css/main.css";</style>
         <script type="text/javascript" src="js/lib.js"></script>
         <style type="text/css">
         div.outer
diff --git a/modules/reports/JobOrderReport.tpl b/modules/reports/JobOrderReport.tpl
index ffe46e52e..6b4c2cbc1 100755
--- a/modules/reports/JobOrderReport.tpl
+++ b/modules/reports/JobOrderReport.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: JobOrderReport.tpl 2441 2007-05-04 20:42:02Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js')); ?>
+<?php TemplateUtility::printHeader('Job Orders', array('js/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/AddUser.tpl b/modules/settings/AddUser.tpl
index 4c5bdd474..0fe7b7a60 100755
--- a/modules/settings/AddUser.tpl
+++ b/modules/settings/AddUser.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: AddUser.tpl 3810 2007-12-05 19:13:25Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'js/sorttable.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/sorttable.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
 <div id="main">
diff --git a/modules/settings/Administration.tpl b/modules/settings/Administration.tpl
index 8b8058d59..c7e4625b0 100755
--- a/modules/settings/Administration.tpl
+++ b/modules/settings/Administration.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Administration.tpl 3722 2007-11-27 21:49:36Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <style>
 #profButton {
diff --git a/modules/settings/CareerPortalSettings.tpl b/modules/settings/CareerPortalSettings.tpl
index 13f09c22d..bc4e4cb96 100755
--- a/modules/settings/CareerPortalSettings.tpl
+++ b/modules/settings/CareerPortalSettings.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CareerPortalSettings.tpl 3806 2007-12-05 00:39:15Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'modules/settings/Settings.js', 'js/careerportal.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/settings/Settings.js', 'js/careerportal.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
 <?php $careerPortalEnabledId = 0; ?>
diff --git a/modules/settings/CareerPortalTemplateEdit.tpl b/modules/settings/CareerPortalTemplateEdit.tpl
index e12c27032..7e1ab01e0 100755
--- a/modules/settings/CareerPortalTemplateEdit.tpl
+++ b/modules/settings/CareerPortalTemplateEdit.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CareerPortalTemplateEdit.tpl 3626 2007-11-16 00:49:03Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'modules/settings/Settings.js', 'js/careerportal.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/settings/Settings.js', 'js/careerportal.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/ChangePassword.tpl b/modules/settings/ChangePassword.tpl
index 95a2619d9..596b65bb1 100755
--- a/modules/settings/ChangePassword.tpl
+++ b/modules/settings/ChangePassword.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: ChangePassword.tpl 1927 2007-02-22 06:03:24Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'js/sorttable.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/sorttable.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/CustomizeCalendar.tpl b/modules/settings/CustomizeCalendar.tpl
index 4a16b94c3..c38fe63b3 100755
--- a/modules/settings/CustomizeCalendar.tpl
+++ b/modules/settings/CustomizeCalendar.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CustomizeCalendar.tpl 1535 2007-01-22 17:55:29Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/CustomizeExtraFields.tpl b/modules/settings/CustomizeExtraFields.tpl
index ba6307472..443caa846 100755
--- a/modules/settings/CustomizeExtraFields.tpl
+++ b/modules/settings/CustomizeExtraFields.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CustomizeExtraFields.tpl 3660 2007-11-19 18:26:19Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('js/highlightrows.js', 'modules/settings/validator.js', 'js/listEditor.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/highlightrows.js', 'js/settings/validator.js', 'js/listEditor.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, ''); ?>
     <div id="main">
diff --git a/modules/settings/CustomizeReports.tpl b/modules/settings/CustomizeReports.tpl
index d2f5f75d3..87eea28d8 100755
--- a/modules/settings/CustomizeReports.tpl
+++ b/modules/settings/CustomizeReports.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: CustomizeReports.tpl 1535 2007-01-22 17:55:29Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/EEOEOCSettings.tpl b/modules/settings/EEOEOCSettings.tpl
index 11c61f2f5..78526f0af 100755
--- a/modules/settings/EEOEOCSettings.tpl
+++ b/modules/settings/EEOEOCSettings.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: EEOEOCSettings.tpl 2336 2007-04-14 22:01:51Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'js/eeo.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/eeo.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/EmailSettings.tpl b/modules/settings/EmailSettings.tpl
index 9b12b4f11..06cbf10fa 100755
--- a/modules/settings/EmailSettings.tpl
+++ b/modules/settings/EmailSettings.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: EmailSettings.tpl 3310 2007-10-25 21:24:20Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'modules/settings/Settings.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/settings/Settings.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/ItemHistory.tpl b/modules/settings/ItemHistory.tpl
index 07b912e98..bdf748c24 100755
--- a/modules/settings/ItemHistory.tpl
+++ b/modules/settings/ItemHistory.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: ItemHistory.tpl 1528 2007-01-22 00:51:45Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <?php $longFields = array('description', 'notes'); ?>
diff --git a/modules/settings/Localization.tpl b/modules/settings/Localization.tpl
index 19456818a..c4d81bc6b 100755
--- a/modules/settings/Localization.tpl
+++ b/modules/settings/Localization.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Localization.tpl 2108 2007-03-08 09:30:00Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/MyProfile.tpl b/modules/settings/MyProfile.tpl
index cb1771d0d..b777f0fba 100755
--- a/modules/settings/MyProfile.tpl
+++ b/modules/settings/MyProfile.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: MyProfile.tpl 2452 2007-05-11 17:47:55Z brian $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'js/sorttable.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/sorttable.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/NewInstallWizard.tpl b/modules/settings/NewInstallWizard.tpl
index cfe3b87c0..9063e71b2 100755
--- a/modules/settings/NewInstallWizard.tpl
+++ b/modules/settings/NewInstallWizard.tpl
@@ -5,9 +5,9 @@
     <head>
         <title>CATS - Initial Configuration Wizard</title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo(HTML_ENCODING); ?>">
-        <style type="text/css" media="all">@import "modules/install/install.css";</style>
+        <style type="text/css" media="all">@import "css/install/install.css";</style>
         <script type="text/javascript" src="js/lib.js"></script>
-        <script type="text/javascript" src="modules/settings/validator.js"></script>
+        <script type="text/javascript" src="js/settings/validator.js"></script>
     </head>
 
     <body>
diff --git a/modules/settings/NewVersionCheck.tpl b/modules/settings/NewVersionCheck.tpl
index 8f850db08..dbe85b369 100755
--- a/modules/settings/NewVersionCheck.tpl
+++ b/modules/settings/NewVersionCheck.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: NewVersionCheck.tpl 3585 2007-11-12 23:27:30Z andrew $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/Passwords.tpl b/modules/settings/Passwords.tpl
index ad8b8e535..e877bca99 100755
--- a/modules/settings/Passwords.tpl
+++ b/modules/settings/Passwords.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Passwords.tpl 1606 2007-02-04 23:27:58Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/PreviewPageTop.tpl b/modules/settings/PreviewPageTop.tpl
index c7c6e6a0d..613f6cab9 100755
--- a/modules/settings/PreviewPageTop.tpl
+++ b/modules/settings/PreviewPageTop.tpl
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo(HTML_ENCODING); ?>">
-        <style type="text/css" media="all">@import "main.css";</style>
+        <style type="text/css" media="all">@import "css/main.css";</style>
         <style type="text/css" media="all">
             body
             {
diff --git a/modules/settings/SiteName.tpl b/modules/settings/SiteName.tpl
index c595693a5..23b1ce080 100755
--- a/modules/settings/SiteName.tpl
+++ b/modules/settings/SiteName.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: SiteName.tpl 1930 2007-02-22 08:39:53Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/SystemInformation.tpl b/modules/settings/SystemInformation.tpl
index 8c18a6f9a..d08d68fc8 100755
--- a/modules/settings/SystemInformation.tpl
+++ b/modules/settings/SystemInformation.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: SystemInformation.tpl 3575 2007-11-12 17:40:45Z will $ */ ?>
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/settings/getFirefoxModal.tpl b/modules/settings/getFirefoxModal.tpl
index b2c8ff4aa..56469293b 100755
--- a/modules/settings/getFirefoxModal.tpl
+++ b/modules/settings/getFirefoxModal.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: getFirefoxModal.tpl 3214 2007-10-16 15:31:00Z will $ */ ?>
-<?php TemplateUtility::printModalHeader('Settings', array('modules/candidates/validator.js'), 'Get Firefox'); ?>
+<?php TemplateUtility::printModalHeader('Settings', array('js/candidates/validator.js'), 'Get Firefox'); ?>
 
             <table class="editTable">
                 <tr>
diff --git a/modules/settings/tags.tpl b/modules/settings/tags.tpl
index 6712d83f7..07e971184 100644
--- a/modules/settings/tags.tpl
+++ b/modules/settings/tags.tpl
@@ -1,7 +1,7 @@
 <?php 
 /* $Id: EmailSettings.tpl 3310 2007-10-25 21:24:20Z brian $ */ ?>
 
-<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'modules/settings/Settings.js')); ?>
+<?php TemplateUtility::printHeader('Settings', array('js/settings/validator.js', 'js/settings/Settings.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
     <div id="main">
diff --git a/modules/tests/CATSTestReporter.php b/modules/tests/CATSTestReporter.php
index e5ef5721b..e007449a4 100755
--- a/modules/tests/CATSTestReporter.php
+++ b/modules/tests/CATSTestReporter.php
@@ -203,7 +203,7 @@ public function printHeader($headIncludes = array())
         echo '    <head>', "\n";
         echo '        <title>CATS - Tests</title>', "\n";
         echo '        <meta http-equiv="Content-Type" content="text/html; charset=', HTML_ENCODING, '">', "\n";
-        echo '        <style type="text/css" media="all">@import "modules/tests/tests.css";</style>', "\n";
+        echo '        <style type="text/css" media="all">@import "css/tests/tests.css";</style>', "\n";
 
         foreach ($headIncludes as $key => $value)
         {
diff --git a/modules/tests/Tests.tpl b/modules/tests/Tests.tpl
index 289ae14b9..1735d5b2c 100755
--- a/modules/tests/Tests.tpl
+++ b/modules/tests/Tests.tpl
@@ -1,5 +1,5 @@
 <?php /* $Id: Tests.tpl 1930 2007-02-22 08:39:53Z will $ */ ?>
-<?php $this->reporter->printHeader(array('modules/tests/validator.js')); ?>
+<?php $this->reporter->printHeader(array('js/tests/validator.js')); ?>
 <?php $this->reporter->printHeaderBlock(); ?>
     <br clear="all" />
     <table>
diff --git a/modules/toolbar/ToolbarUI.php b/modules/toolbar/ToolbarUI.php
index b3983e8dc..0dc8fea85 100755
--- a/modules/toolbar/ToolbarUI.php
+++ b/modules/toolbar/ToolbarUI.php
@@ -151,7 +151,7 @@ private function getJavaScriptLibLegacy()
         // FIXME: Send a JS library that just makes a button indicating that their version
         // is out of date.
 
-        $toolbarLibrary = @file_get_contents('./modules/toolbar/toolbarlibForLegacy.js');
+        $toolbarLibrary = @file_get_contents('./js/toolbar/toolbarlibForLegacy.js');
         echo $toolbarLibrary;
         return;
     }
diff --git a/modules/wizard/Show.tpl b/modules/wizard/Show.tpl
index 068521df5..ad36476f6 100755
--- a/modules/wizard/Show.tpl
+++ b/modules/wizard/Show.tpl
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="icon" href="images/favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" href="modules/wizard/style.css" type="text/css" />
-    <script type="text/javascript" src="modules/wizard/wizard.js"></script>
+    <link rel="stylesheet" href="css/wizard/style.css" type="text/css" />
+    <script type="text/javascript" src="js/wizard/wizard.js"></script>
     <?php if ($this->jsInclude != ''): ?>
     <script type="text/javascript" src="<?php echo $this->jsInclude; ?>"></script>
     <?php endif; ?>