Group options files in folder

background.js

@@ -898,7 +898,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
     }, function (tabs) {
       if (tabs.length > 0 && tabs[0].url && tabs[0].url.indexOf("http") !== -1) {
         ext_api.tabs.executeScript({
-          file: 'toggleIcon.js',
+          file: 'options/toggleIcon.js',
           runAt: 'document_start'
         }, function (res) {
           if (ext_api.runtime.lastError || res[0]) {
@@ -1227,7 +1227,7 @@ function clear_cookies() {
   }, function (tabs) {
     if (tabs.length > 0 && tabs[0].url && tabs[0].url.indexOf("http") !== -1) {
       ext_api.tabs.executeScript({
-        file: 'clearCookies.js',
+        file: 'options/clearCookies.js',
         runAt: 'document_start'
       }, function (res) {
         if (ext_api.runtime.lastError || res[0]) {

manifest.json

@@ -10,7 +10,7 @@
         }
     },
     "browser_action": {
-        "default_popup": "popup.html",
+        "default_popup": "options/popup.html",
         "default_icon": {
             "128": "bypass.png"
         },
@@ -32,7 +32,7 @@
     "options_ui": {
         "browser_style": true,
         "open_in_tab": true,
-        "page": "options.html"
+        "page": "options/options.html"
     },
     "optional_permissions": [
         "<all_urls>"

options/options.html

@@ -46,7 +46,7 @@
     <button><a href="options_excluded.html" style="text-decoration:none;color:inherit">Excluded sites</a></button>
     <button id="button-close">Close</button>
   </span>
-  <script src="sites.js"></script>
+  <script src="../sites.js"></script>
   <script src="options.js"></script>
   <script src="version.js"></script>
 </body>

options/options_custom.html

@@ -65,7 +65,7 @@
     <button><a href="options.html" style="text-decoration:none;color:inherit">Options</a></button>
   </span>
 
+ <script src="../sites.js"></script>
  <script src="options_custom.js"></script>
- <script src="sites.js"></script>								 
 </body>
 </html>