diff --git a/data/css/formwizard.css b/data/css/lib/formwizard.css
similarity index 100%
rename from data/css/formwizard.css
rename to data/css/lib/formwizard.css
diff --git a/data/css/jquery.pnotify.default.css b/data/css/lib/jquery.pnotify.default.css
similarity index 100%
rename from data/css/jquery.pnotify.default.css
rename to data/css/lib/jquery.pnotify.default.css
diff --git a/data/css/jquery.qtip2.css b/data/css/lib/jquery.qtip2.css
similarity index 100%
rename from data/css/jquery.qtip2.css
rename to data/css/lib/jquery.qtip2.css
diff --git a/data/css/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png b/data/css/lib/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png
rename to data/css/lib/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png
diff --git a/data/css/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png b/data/css/lib/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_flat_0_6e4f1c_40x100.png b/data/css/lib/smooth-grinder/images/ui-bg_flat_0_6e4f1c_40x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_flat_0_6e4f1c_40x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_flat_0_6e4f1c_40x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png b/data/css/lib/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png b/data/css/lib/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to data/css/lib/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/data/css/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png b/data/css/lib/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png
rename to data/css/lib/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/data/css/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png b/data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png b/data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png b/data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png
diff --git a/data/css/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png b/data/css/lib/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png
rename to data/css/lib/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png
diff --git a/data/css/smooth-grinder/images/ui-icons_222222_256x240.png b/data/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-icons_222222_256x240.png
rename to data/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png
diff --git a/data/css/smooth-grinder/images/ui-icons_2e83ff_256x240.png b/data/css/lib/smooth-grinder/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-icons_2e83ff_256x240.png
rename to data/css/lib/smooth-grinder/images/ui-icons_2e83ff_256x240.png
diff --git a/data/css/smooth-grinder/images/ui-icons_8c291d_256x240.png b/data/css/lib/smooth-grinder/images/ui-icons_8c291d_256x240.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-icons_8c291d_256x240.png
rename to data/css/lib/smooth-grinder/images/ui-icons_8c291d_256x240.png
diff --git a/data/css/smooth-grinder/images/ui-icons_cd0a0a_256x240.png b/data/css/lib/smooth-grinder/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from data/css/smooth-grinder/images/ui-icons_cd0a0a_256x240.png
rename to data/css/lib/smooth-grinder/images/ui-icons_cd0a0a_256x240.png
diff --git a/data/css/smooth-grinder/jquery-ui-1.8.17.custom.css b/data/css/lib/smooth-grinder/jquery-ui-1.8.17.custom.css
similarity index 100%
rename from data/css/smooth-grinder/jquery-ui-1.8.17.custom.css
rename to data/css/lib/smooth-grinder/jquery-ui-1.8.17.custom.css
diff --git a/data/css/superfish.css b/data/css/lib/superfish.css
similarity index 100%
rename from data/css/superfish.css
rename to data/css/lib/superfish.css
diff --git a/data/interfaces/default/apiBuilder.tmpl b/data/interfaces/default/apiBuilder.tmpl
index b948b0097d5435014264c0d1ef0ddc8f703864e6..f6a1dd5570d9bc10f8ad170648497af7e0fe9fb2 100644
--- a/data/interfaces/default/apiBuilder.tmpl
+++ b/data/interfaces/default/apiBuilder.tmpl
@@ -8,7 +8,7 @@
 sbRoot = "$sbRoot";
 //-->
 </script>
-<script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="$sbRoot/js/apibuilder.js"></script>
 
 <style type="text/css">
diff --git a/data/interfaces/default/displayShow.tmpl b/data/interfaces/default/displayShow.tmpl
index a1b5649076bf2188c609bbe0f1e5e6a9f9de56d9..92dc5e5c230d0e7ce4b7b999f3d73fbc09793012 100644
--- a/data/interfaces/default/displayShow.tmpl
+++ b/data/interfaces/default/displayShow.tmpl
@@ -9,7 +9,7 @@
 #set global $topmenu="manageShows"#
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")
 
-<script type="text/javascript" src="$sbRoot/js/jquery.bookmarkscroll.js"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery.bookmarkscroll.js"></script>
 
 
 <div class="h2footer align-right">
diff --git a/data/interfaces/default/home_newShow.tmpl b/data/interfaces/default/home_newShow.tmpl
index dbb930271f8da1032d0dcbd8dd34fe2b6e88b984..442d9ca6b25c1fd9d7d3f814f135fb3d8cf6ce00 100644
--- a/data/interfaces/default/home_newShow.tmpl
+++ b/data/interfaces/default/home_newShow.tmpl
@@ -11,8 +11,8 @@
 
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")
 
-<link rel="stylesheet" type="text/css" href="$sbRoot/css/formwizard.css" />
-<script type="text/javascript" src="$sbRoot/js/formwizard.js"></script>
+<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/formwizard.css" />
+<script type="text/javascript" src="$sbRoot/js/lib/formwizard.js"></script>
 <script type="text/javascript" src="$sbRoot/js/qualityChooser.js"></script>
 <script type="text/javascript" src="$sbRoot/js/newShow.js"></script>
 <script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script> 
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index 51ae9fb95d5014dbd71799de367a1469bbef7248..75db3ed3d04612dd51e7bb1e19d6cc49e92b99ce 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -14,11 +14,11 @@
     <link rel="stylesheet" type="text/css" href="$sbRoot/css/browser.css" />
     <link rel="stylesheet" type="text/css" href="$sbRoot/css/comingEpisodes.css" />
     <link rel="stylesheet" type="text/css" href="$sbRoot/css/config.css" />
-    <link rel="stylesheet" type="text/css" href="$sbRoot/css/jquery.pnotify.default.css" />
-    <link rel="stylesheet" type="text/css" href="$sbRoot/css/smooth-grinder/jquery-ui-1.8.17.custom.css" />
-    <link rel="stylesheet" type="text/css" href="$sbRoot/css/superfish.css" />
+    <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.pnotify.default.css" />
+    <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/smooth-grinder/jquery-ui-1.8.17.custom.css" />
+    <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/superfish.css" />
     <link rel="stylesheet" type="text/css" href="$sbRoot/css/tablesorter.css"/>
-    <link rel="stylesheet" type="text/css" href="$sbRoot/css/jquery.qtip2.css"/>
+    <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.qtip2.css"/>
     <link rel="stylesheet" type="text/css" media="only screen and (max-device-width: 480px)" href="$sbRoot/css/iphone.css" />
 
 <style type="text/css">
@@ -64,20 +64,20 @@ th.tablesorter-headerSortDown { background-image: url("$sbRoot/images/tablesorte
 //--> 
 </style>
 
-    <script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery-ui-1.8.17.custom.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/superfish-1.4.8.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/supersubs-0.2b.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.cookie.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.cookiejar.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.json-2.2.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.selectboxes.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.tablesorter-2.1.10.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.tablesorter.widgets.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.qtip-2011-11-14.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.pnotify-1.0.2.min.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.expand-1.3.8.js"></script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.form-2.92.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.8.17.custom.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/superfish-1.4.8.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/supersubs-0.2b.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookiejar.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.json-2.2.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.1.10.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2011-11-14.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.0.2.min.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.expand-1.3.8.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-2.92.js"></script>
 
     <script type="text/javascript" charset="utf-8">
     <!--
@@ -86,7 +86,7 @@ th.tablesorter-headerSortDown { background-image: url("$sbRoot/images/tablesorte
         top_image_html = '<img src="$sbRoot/images/top.gif" style="width:31px; height:11px" alt="Jump to top" />'; 
     //-->
     </script>
-    <script type="text/javascript" src="$sbRoot/js/jquery.scrolltopcontrol-1.1.js"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.scrolltopcontrol-1.1.js"></script>
     <script type="text/javascript" src="$sbRoot/js/browser.js"></script>
     <script type="text/javascript" src="$sbRoot/js/ajaxNotifications.js"></script>
     
diff --git a/data/interfaces/default/restart_bare.tmpl b/data/interfaces/default/restart_bare.tmpl
index 150c3281f098014e1bee8f4c90eb01ad61f30814..bb2e01dbd0cfe3df89bb2e6a577a89ea0c0ea5b1 100644
--- a/data/interfaces/default/restart_bare.tmpl
+++ b/data/interfaces/default/restart_bare.tmpl
@@ -16,7 +16,7 @@ sbHost = "$curSBHost";
 //-->
 </script>
 
-<script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="$sbRoot/js/restart.js"></script>
 
 <h2>Performing Restart</h2>
diff --git a/data/js/formwizard.js b/data/js/lib/formwizard.js
similarity index 100%
rename from data/js/formwizard.js
rename to data/js/lib/formwizard.js
diff --git a/data/js/jquery-1.7.1.min.js b/data/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from data/js/jquery-1.7.1.min.js
rename to data/js/lib/jquery-1.7.1.min.js
diff --git a/data/js/jquery-ui-1.8.17.custom.min.js b/data/js/lib/jquery-ui-1.8.17.custom.min.js
similarity index 100%
rename from data/js/jquery-ui-1.8.17.custom.min.js
rename to data/js/lib/jquery-ui-1.8.17.custom.min.js
diff --git a/data/js/jquery.bookmarkscroll.js b/data/js/lib/jquery.bookmarkscroll.js
similarity index 100%
rename from data/js/jquery.bookmarkscroll.js
rename to data/js/lib/jquery.bookmarkscroll.js
diff --git a/data/js/jquery.cookie.js b/data/js/lib/jquery.cookie.js
similarity index 100%
rename from data/js/jquery.cookie.js
rename to data/js/lib/jquery.cookie.js
diff --git a/data/js/jquery.cookiejar.js b/data/js/lib/jquery.cookiejar.js
similarity index 100%
rename from data/js/jquery.cookiejar.js
rename to data/js/lib/jquery.cookiejar.js
diff --git a/data/js/jquery.expand-1.3.8.js b/data/js/lib/jquery.expand-1.3.8.js
similarity index 100%
rename from data/js/jquery.expand-1.3.8.js
rename to data/js/lib/jquery.expand-1.3.8.js
diff --git a/data/js/jquery.form-2.92.js b/data/js/lib/jquery.form-2.92.js
similarity index 100%
rename from data/js/jquery.form-2.92.js
rename to data/js/lib/jquery.form-2.92.js
diff --git a/data/js/jquery.json-2.2.min.js b/data/js/lib/jquery.json-2.2.min.js
similarity index 100%
rename from data/js/jquery.json-2.2.min.js
rename to data/js/lib/jquery.json-2.2.min.js
diff --git a/data/js/jquery.pnotify-1.0.2.min.js b/data/js/lib/jquery.pnotify-1.0.2.min.js
similarity index 100%
rename from data/js/jquery.pnotify-1.0.2.min.js
rename to data/js/lib/jquery.pnotify-1.0.2.min.js
diff --git a/data/js/jquery.qtip-2011-11-14.min.js b/data/js/lib/jquery.qtip-2011-11-14.min.js
similarity index 100%
rename from data/js/jquery.qtip-2011-11-14.min.js
rename to data/js/lib/jquery.qtip-2011-11-14.min.js
diff --git a/data/js/jquery.scrolltopcontrol-1.1.js b/data/js/lib/jquery.scrolltopcontrol-1.1.js
similarity index 100%
rename from data/js/jquery.scrolltopcontrol-1.1.js
rename to data/js/lib/jquery.scrolltopcontrol-1.1.js
diff --git a/data/js/jquery.selectboxes.min.js b/data/js/lib/jquery.selectboxes.min.js
similarity index 100%
rename from data/js/jquery.selectboxes.min.js
rename to data/js/lib/jquery.selectboxes.min.js
diff --git a/data/js/jquery.tablesorter-2.1.10.min.js b/data/js/lib/jquery.tablesorter-2.1.10.min.js
similarity index 100%
rename from data/js/jquery.tablesorter-2.1.10.min.js
rename to data/js/lib/jquery.tablesorter-2.1.10.min.js
diff --git a/data/js/jquery.tablesorter.widgets.min.js b/data/js/lib/jquery.tablesorter.widgets.min.js
similarity index 100%
rename from data/js/jquery.tablesorter.widgets.min.js
rename to data/js/lib/jquery.tablesorter.widgets.min.js
diff --git a/data/js/superfish-1.4.8.js b/data/js/lib/superfish-1.4.8.js
similarity index 100%
rename from data/js/superfish-1.4.8.js
rename to data/js/lib/superfish-1.4.8.js
diff --git a/data/js/supersubs-0.2b.js b/data/js/lib/supersubs-0.2b.js
similarity index 100%
rename from data/js/supersubs-0.2b.js
rename to data/js/lib/supersubs-0.2b.js