diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index a206238..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,38 +0,0 @@
-  {
-      "name": "Enhanced Aniwatch",
-      "version": "0.1.0.0",
-      "description": "Contains several enhancments for https://aniwatch.me.",
-      "manifest_version": 2,
-      "author": "Serraniel",
-      "homepage_url": "https://github.com/Serraniel/EnhancedAniwatch",
-      "options_ui": {
-              "page": "settings/settings.html",
-              "open_in_tab": true
-      },
-      "permissions": [
-              "storage"
-      ],
-      "content_scripts": [{
-              "matches": [
-                  "*://aniwatch.me/*"
-              ],
-              "js": [
-                  "settings/SettingsProvider.js",
-                  "utils/colors.js",
-                  "utils/helpers.js",
-                  "utils/aniwatchCore.js"
-              ],
-              "run_at": "document_start"
-          },
-          {
-              "matches": [
-                  "*://aniwatch.me/*"
-              ],
-              "js": [
-                  "enhancements/quickSearch.js",
-                  "enhancements/animeRequests.js"
-              ],
-              "run_at": "document_end"
-          }
-      ]
-  }
\ No newline at end of file
diff --git a/settings/settings.html b/src/html/settings.html
similarity index 89%
rename from settings/settings.html
rename to src/html/settings.html
index c0bb0b8..4a8647d 100644
--- a/settings/settings.html
+++ b/src/html/settings.html
@@ -17,7 +17,5 @@
     <button id="save">Save</button>
 
 </form>
-<script src="settings.js"></script>
-<script src="SettingsProvider.js"></script>
 </body>
 </html>
diff --git a/settings/SettingsProvider.js b/src/javascript/settings/SettingsProvider.js
similarity index 100%
rename from settings/SettingsProvider.js
rename to src/javascript/settings/SettingsProvider.js
diff --git a/settings/settings.js b/src/javascript/settings/settings.js
similarity index 100%
rename from settings/settings.js
rename to src/javascript/settings/settings.js
diff --git a/src/manifests/chrome.manifest.json b/src/manifests/chrome.manifest.json
index 0f4c6ac..ed0b479 100644
--- a/src/manifests/chrome.manifest.json
+++ b/src/manifests/chrome.manifest.json
@@ -14,16 +14,22 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
-        "matches": [
-            "*://aniwatch.me/*"
-        ],
-        "js": [
-            "javascript/app.min.js"
-        ],
-        "css": [
-            "stylesheets/aniwatchplus.min.css"
-        ],
-        "run_at": "document_end"
-    }]
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
+            "matches": [
+                "*://aniwatch.me/*"
+            ],
+            "js": [
+                "javascript/app.min.js"
+            ],
+            "css": [
+                "stylesheets/aniwatchplus.min.css"
+            ],
+            "run_at": "document_end"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/src/manifests/firefox.manifest.json b/src/manifests/firefox.manifest.json
index 3cc2904..ca58bad 100644
--- a/src/manifests/firefox.manifest.json
+++ b/src/manifests/firefox.manifest.json
@@ -14,16 +14,22 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
-        "matches": [
-            "*://aniwatch.me/*"
-        ],
-        "js": [
-            "javascript/app.min.js"
-        ],
-        "css": [
-            "stylesheets/aniwatchplus.min.css"
-        ],
-        "run_at": "document_end"
-    }]
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
+            "matches": [
+                "*://aniwatch.me/*"
+            ],
+            "js": [
+                "javascript/app.min.js"
+            ],
+            "css": [
+                "stylesheets/aniwatchplus.min.css"
+            ],
+            "run_at": "document_end"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/src/manifests/manifest.template.json b/src/manifests/manifest.template.json
index f2d1e2a..e8c8b3f 100644
--- a/src/manifests/manifest.template.json
+++ b/src/manifests/manifest.template.json
@@ -18,16 +18,22 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
-        "matches": [
-            "*://aniwatch.me/*"
-        ],
-        "js": [
-            "javascript/app.min.js"
-        ],
-        "css": [
-            "stylesheets/aniwatchplus.min.css"
-        ],
-        "run_at": "document_end"
-    }]
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
+            "matches": [
+                "*://aniwatch.me/*"
+            ],
+            "js": [
+                "javascript/app.min.js"
+            ],
+            "css": [
+                "stylesheets/aniwatchplus.min.css"
+            ],
+            "run_at": "document_end"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/src/manifests/opera.manifest.json b/src/manifests/opera.manifest.json
index 0ad7f9e..eede200 100644
--- a/src/manifests/opera.manifest.json
+++ b/src/manifests/opera.manifest.json
@@ -15,16 +15,22 @@
         "48": "images/icon/icon_48.png",
         "96": "images/icon/icon_96.png"
     },
-    "content_scripts": [{
-        "matches": [
-            "*://aniwatch.me/*"
-        ],
-        "js": [
-            "javascript/app.min.js"
-        ],
-        "css": [
-            "stylesheets/aniwatchplus.min.css"
-        ],
-        "run_at": "document_end"
-    }]
+    "options_ui": {
+        "page": "html/settings.html",
+        "open_in_tab": true
+    },
+    "content_scripts": [
+        {
+            "matches": [
+                "*://aniwatch.me/*"
+            ],
+            "js": [
+                "javascript/app.min.js"
+            ],
+            "css": [
+                "stylesheets/aniwatchplus.min.css"
+            ],
+            "run_at": "document_end"
+        }
+    ]
 }
\ No newline at end of file