diff --git a/manifest.json b/manifest.json
index 88f612e..eec349f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,15 +10,14 @@
     },
   
     "background": {
-        "scripts": ["remove-by-URL.js"]
+        "scripts": ["./src/remove-by-URL.js"]
     },
 
     "content_scripts": [
         {
             "matches": ["*://*.github.com/*"],
-            "js": ["remove-by-element.js"],
-            "run_at": "document_idle",
-            "world": "MAIN"
+            "js": ["./src/remove-by-element.js"],
+            "run_at": "document_end"
         }
     ],
 
diff --git a/remove-by-URL.js b/src/remove-by-URL.js
similarity index 100%
rename from remove-by-URL.js
rename to src/remove-by-URL.js
diff --git a/remove-by-element.js b/src/remove-by-element.js
similarity index 100%
rename from remove-by-element.js
rename to src/remove-by-element.js