diff --git a/background.js b/background.js
index 77b65ed..7886715 100644
--- a/background.js
+++ b/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]) {
diff --git a/manifest.json b/manifest.json
index d048d31..b952f13 100644
--- a/manifest.json
+++ b/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>"
diff --git a/clearCookies.js b/options/clearCookies.js
similarity index 100%
rename from clearCookies.js
rename to options/clearCookies.js
diff --git a/optin/opt-in.css b/options/optin/opt-in.css
similarity index 100%
rename from optin/opt-in.css
rename to options/optin/opt-in.css
diff --git a/optin/opt-in.html b/options/optin/opt-in.html
similarity index 100%
rename from optin/opt-in.html
rename to options/optin/opt-in.html
diff --git a/optin/opt-in.js b/options/optin/opt-in.js
similarity index 100%
rename from optin/opt-in.js
rename to options/optin/opt-in.js
diff --git a/options.html b/options/options.html
similarity index 98%
rename from options.html
rename to options/options.html
index 103bbbb..891aec1 100644
--- a/options.html
+++ b/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>
diff --git a/options.js b/options/options.js
similarity index 100%
rename from options.js
rename to options/options.js
diff --git a/options_custom.html b/options/options_custom.html
similarity index 98%
rename from options_custom.html
rename to options/options_custom.html
index bebf85a..65181e5 100644
--- a/options_custom.html
+++ b/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>
diff --git a/options_custom.js b/options/options_custom.js
similarity index 100%
rename from options_custom.js
rename to options/options_custom.js
diff --git a/options_excluded.html b/options/options_excluded.html
similarity index 100%
rename from options_excluded.html
rename to options/options_excluded.html
diff --git a/options_excluded.js b/options/options_excluded.js
similarity index 100%
rename from options_excluded.js
rename to options/options_excluded.js
diff --git a/popup.html b/options/popup.html
similarity index 100%
rename from popup.html
rename to options/popup.html
diff --git a/popup.js b/options/popup.js
similarity index 100%
rename from popup.js
rename to options/popup.js
diff --git a/popup_switch.css b/options/popup_switch.css
similarity index 100%
rename from popup_switch.css
rename to options/popup_switch.css
diff --git a/version.js b/options/version.js
similarity index 100%
rename from version.js
rename to options/version.js