diff --git a/src/webui/webui.qrc b/src/webui/webui.qrc
index 048ff7909..f541fbfa5 100644
--- a/src/webui/webui.qrc
+++ b/src/webui/webui.qrc
@@ -1,32 +1,14 @@
 <RCC>
     <qresource prefix="/">
+        <file>www/private/about.html</file>
+        <file>www/private/addtrackers.html</file>
+        <file>www/private/confirmdeletion.html</file>
         <file>www/private/css/Core.css</file>
         <file>www/private/css/dynamicTable.css</file>
         <file>www/private/css/Layout.css</file>
         <file>www/private/css/style.css</file>
         <file>www/private/css/Tabs.css</file>
         <file>www/private/css/Window.css</file>
-        <file>www/private/scripts/client.js</file>
-        <file>www/private/scripts/clipboard.min.js</file>
-        <file>www/private/scripts/contextmenu.js</file>
-        <file>www/private/scripts/download.js</file>
-        <file>www/private/scripts/dynamicTable.js</file>
-        <file>www/private/scripts/excanvas-compressed.js</file>
-        <file>www/private/scripts/misc.js</file>
-        <file>www/private/scripts/mocha.js</file>
-        <file>www/private/scripts/mocha-init.js</file>
-        <file>www/private/scripts/mocha-yc.js</file>
-        <file>www/private/scripts/mootools-1.2-core-yc.js</file>
-        <file>www/private/scripts/mootools-1.2-more.js</file>
-        <file>www/private/scripts/parametrics.js</file>
-        <file>www/private/scripts/progressbar.js</file>
-        <file>www/private/scripts/prop-files.js</file>
-        <file>www/private/scripts/prop-general.js</file>
-        <file>www/private/scripts/prop-trackers.js</file>
-        <file>www/private/scripts/prop-webseeds.js</file>
-        <file>www/private/about.html</file>
-        <file>www/private/addtrackers.html</file>
-        <file>www/private/confirmdeletion.html</file>
         <file>www/private/download.html</file>
         <file>www/private/downloadlimit.html</file>
         <file>www/private/filters.html</file>
@@ -37,13 +19,31 @@
         <file>www/private/properties.html</file>
         <file>www/private/properties_content.html</file>
         <file>www/private/rename.html</file>
+        <file>www/private/scripts/client.js</file>
+        <file>www/private/scripts/contextmenu.js</file>
+        <file>www/private/scripts/download.js</file>
+        <file>www/private/scripts/dynamicTable.js</file>
+        <file>www/private/scripts/lib/clipboard.min.js</file>
+        <file>www/private/scripts/lib/excanvas-compressed.js</file>
+        <file>www/private/scripts/lib/mocha-yc.js</file>
+        <file>www/private/scripts/lib/mocha.js</file>
+        <file>www/private/scripts/lib/mootools-1.2-core-yc.js</file>
+        <file>www/private/scripts/lib/mootools-1.2-more.js</file>
+        <file>www/private/scripts/lib/parametrics.js</file>
+        <file>www/private/scripts/misc.js</file>
+        <file>www/private/scripts/mocha-init.js</file>
+        <file>www/private/scripts/progressbar.js</file>
+        <file>www/private/scripts/prop-files.js</file>
+        <file>www/private/scripts/prop-general.js</file>
+        <file>www/private/scripts/prop-trackers.js</file>
+        <file>www/private/scripts/prop-webseeds.js</file>
         <file>www/private/setlocation.html</file>
         <file>www/private/statistics.html</file>
         <file>www/private/transferlist.html</file>
         <file>www/private/upload.html</file>
         <file>www/private/uploadlimit.html</file>
         <file>www/public/css/style.css</file>
-        <file>www/public/scripts/mootools-1.2-core-yc.js</file>
         <file>www/public/login.html</file>
+        <file>www/public/scripts/lib/mootools-1.2-core-yc.js</file>
     </qresource>
 </RCC>
diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
index ec31a5286..150804078 100644
--- a/src/webui/www/private/addtrackers.html
+++ b/src/webui/www/private/addtrackers.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Trackers addition dialog)QBT_TR[CONTEXT=TrackersAdditionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         window.addEvent('domready', function(){
             $('trackersUrls').focus();
diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html
index 8a16b7954..07747a316 100644
--- a/src/webui/www/private/confirmdeletion.html
+++ b/src/webui/www/private/confirmdeletion.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Deletion confirmation - qBittorrent)QBT_TR[CONTEXT=confirmDeletionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var hashes = new URI().getData('hashes').split('|');
         window.addEvent('domready', function(){
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index c91acee8f..3de510b1d 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -5,7 +5,7 @@
     <title>QBT_TR(Add Torrent Links)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/download.js"></script>
 </head>
 <body>
diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
index 39ed632ff..4894702a0 100644
--- a/src/webui/www/private/downloadlimit.html
+++ b/src/webui/www/private/downloadlimit.html
@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Download Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
-    <script src="scripts/parametrics.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
+    <script src="scripts/lib/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 6e3e93a21..f5052ce04 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -12,14 +12,14 @@
     <link rel="stylesheet" type="text/css" href="css/Layout.css" />
     <link rel="stylesheet" type="text/css" href="css/Window.css" />
     <link rel="stylesheet" type="text/css" href="css/Tabs.css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <!--[if IE]>
-        <script src="scripts/excanvas-compressed.js"></script>
+        <script src="scripts/lib/excanvas-compressed.js"></script>
     <![endif]-->
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
     <script src="scripts/mocha-init.js"></script>
-    <script src="scripts/clipboard.min.js"></script>
+    <script src="scripts/lib/clipboard.min.js"></script>
     <script src="scripts/misc.js"></script>
     <script src="scripts/progressbar.js"></script>
     <script src="scripts/dynamicTable.js"></script>
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 839fccbfb..9bc4ed957 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(New Category)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var newCategoryKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
diff --git a/src/webui/www/private/preferences.html b/src/webui/www/private/preferences.html
index b077e00fb..1db6db176 100644
--- a/src/webui/www/private/preferences.html
+++ b/src/webui/www/private/preferences.html
@@ -5,9 +5,9 @@
     <title>QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Tabs.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
 </head>
 <body style="padding: 5px;">
 <!-- preferences -->
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 88f59d7ba..299e1d650 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Rename)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script src="scripts/misc.js"></script>
     <script>
         var renameKeyboardEvents = new Keyboard({
diff --git a/src/webui/www/private/scripts/clipboard.min.js b/src/webui/www/private/scripts/lib/clipboard.min.js
similarity index 100%
rename from src/webui/www/private/scripts/clipboard.min.js
rename to src/webui/www/private/scripts/lib/clipboard.min.js
diff --git a/src/webui/www/private/scripts/excanvas-compressed.js b/src/webui/www/private/scripts/lib/excanvas-compressed.js
similarity index 100%
rename from src/webui/www/private/scripts/excanvas-compressed.js
rename to src/webui/www/private/scripts/lib/excanvas-compressed.js
diff --git a/src/webui/www/private/scripts/mocha-yc.js b/src/webui/www/private/scripts/lib/mocha-yc.js
similarity index 100%
rename from src/webui/www/private/scripts/mocha-yc.js
rename to src/webui/www/private/scripts/lib/mocha-yc.js
diff --git a/src/webui/www/private/scripts/mocha.js b/src/webui/www/private/scripts/lib/mocha.js
similarity index 100%
rename from src/webui/www/private/scripts/mocha.js
rename to src/webui/www/private/scripts/lib/mocha.js
diff --git a/src/webui/www/private/scripts/mootools-1.2-core-yc.js b/src/webui/www/private/scripts/lib/mootools-1.2-core-yc.js
similarity index 100%
rename from src/webui/www/private/scripts/mootools-1.2-core-yc.js
rename to src/webui/www/private/scripts/lib/mootools-1.2-core-yc.js
diff --git a/src/webui/www/private/scripts/mootools-1.2-more.js b/src/webui/www/private/scripts/lib/mootools-1.2-more.js
similarity index 100%
rename from src/webui/www/private/scripts/mootools-1.2-more.js
rename to src/webui/www/private/scripts/lib/mootools-1.2-more.js
diff --git a/src/webui/www/private/scripts/parametrics.js b/src/webui/www/private/scripts/lib/parametrics.js
similarity index 100%
rename from src/webui/www/private/scripts/parametrics.js
rename to src/webui/www/private/scripts/lib/parametrics.js
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index c169fbbda..ebf884021 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Set location)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var setLocationKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index db5d798fa..4e1c77b4f 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -5,7 +5,7 @@
     <title>QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/download.js"></script>
 </head>
 <body>
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html
index c8684aac6..6cdb27948 100644
--- a/src/webui/www/private/uploadlimit.html
+++ b/src/webui/www/private/uploadlimit.html
@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Upload Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
-    <script src="scripts/parametrics.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
+    <script src="scripts/lib/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">
diff --git a/src/webui/www/public/login.html b/src/webui/www/public/login.html
index 3e10f6f1c..080795745 100644
--- a/src/webui/www/public/login.html
+++ b/src/webui/www/public/login.html
@@ -5,7 +5,7 @@
     <title>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
     <link rel="icon" type="image/png" href="images/skin/qbittorrent16.png" />
     <link rel="stylesheet" type="text/css" href="css/style.css" />
-    <script src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script>
       window.onload = function() {
         $('username').focus();
diff --git a/src/webui/www/public/scripts/mootools-1.2-core-yc.js b/src/webui/www/public/scripts/lib/mootools-1.2-core-yc.js
similarity index 100%
rename from src/webui/www/public/scripts/mootools-1.2-core-yc.js
rename to src/webui/www/public/scripts/lib/mootools-1.2-core-yc.js