diff --git a/apps/web-clipper/background.js b/apps/web-clipper/entrypoints/background/index.js
similarity index 100%
rename from apps/web-clipper/background.js
rename to apps/web-clipper/entrypoints/background/index.js
diff --git a/apps/web-clipper/content.js b/apps/web-clipper/entrypoints/content/index.js
similarity index 100%
rename from apps/web-clipper/content.js
rename to apps/web-clipper/entrypoints/content/index.js
diff --git a/apps/web-clipper/options/options.html b/apps/web-clipper/entrypoints/options/index.html
similarity index 100%
rename from apps/web-clipper/options/options.html
rename to apps/web-clipper/entrypoints/options/index.html
diff --git a/apps/web-clipper/options/options.js b/apps/web-clipper/entrypoints/options/index.js
similarity index 100%
rename from apps/web-clipper/options/options.js
rename to apps/web-clipper/entrypoints/options/index.js
diff --git a/apps/web-clipper/popup/popup.html b/apps/web-clipper/entrypoints/popup/index.html
similarity index 100%
rename from apps/web-clipper/popup/popup.html
rename to apps/web-clipper/entrypoints/popup/index.html
diff --git a/apps/web-clipper/popup/popup.css b/apps/web-clipper/entrypoints/popup/popup.css
similarity index 100%
rename from apps/web-clipper/popup/popup.css
rename to apps/web-clipper/entrypoints/popup/popup.css
diff --git a/apps/web-clipper/popup/popup.js b/apps/web-clipper/entrypoints/popup/popup.js
similarity index 100%
rename from apps/web-clipper/popup/popup.js
rename to apps/web-clipper/entrypoints/popup/popup.js
diff --git a/apps/web-clipper/manifest.json b/apps/web-clipper/manifest.json
index fe3b983023..8e0c1ba2bc 100644
--- a/apps/web-clipper/manifest.json
+++ b/apps/web-clipper/manifest.json
@@ -31,8 +31,7 @@
       ],
       "js": [
         "lib/browser-polyfill.js",
-        "utils.js",
-        "content.js"
+        "utils.js"
       ]
     }
   ],
@@ -40,13 +39,9 @@
     "scripts": [
       "lib/browser-polyfill.js",
       "utils.js",
-      "trilium_server_facade.js",
-      "background.js"
+      "trilium_server_facade.js"
     ]
   },
-  "options_ui": {
-    "page": "options/options.html"
-  },
   "commands": {
     "saveSelection": {
       "description": "Save the selected text into a note",