diff --git a/package.json b/package.json
index c78598ab8..fd4a66e71 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "gitify",
   "version": "5.9.0",
   "description": "GitHub Notifications on your menu bar.",
-  "main": "main.js",
+  "main": "src/electron/main.js",
   "scripts": {
     "build": "webpack --config webpack.prod.js",
     "clean": "rimraf build coverage node_modules",
@@ -64,14 +64,7 @@
   "build": {
     "appId": "com.electron.gitify",
     "productName": "Gitify",
-    "files": [
-      "build/**/*",
-      "assets/**/*",
-      "index.html",
-      "LICENSE",
-      "main.js",
-      "first-run.js"
-    ],
+    "files": ["build/**/*", "assets/**/*", "src/electron/*", "LICENSE"],
     "mac": {
       "category": "public.app-category.developer-tools",
       "icon": "assets/images/app-icon.icns",
diff --git a/first-run.js b/src/electron/first-run.js
similarity index 100%
rename from first-run.js
rename to src/electron/first-run.js
diff --git a/index.html b/src/electron/index.html
similarity index 84%
rename from index.html
rename to src/electron/index.html
index 0d6c1a871..89b4b9064 100644
--- a/index.html
+++ b/src/electron/index.html
@@ -15,7 +15,7 @@
     ></div>
   </body>
 
-  <script src="./build/js/app.js"></script>
+  <script src="./../../build/js/app.js"></script>
 
   <style>
     html,
@@ -27,34 +27,34 @@
 
     html::-webkit-scrollbar,
     div.flex-grow::-webkit-scrollbar {
-        width: 10px;
+      width: 10px;
     }
 
     html::-webkit-scrollbar-thumb,
     div.flex-grow::-webkit-scrollbar-thumb {
-        background-color: #c1c1c1;
-        border-radius: 10px;
+      background-color: #c1c1c1;
+      border-radius: 10px;
     }
 
     html::-webkit-scrollbar-thumb:hover,
     div.flex-grow::-webkit-scrollbar-thumb:hover {
-        background-color: #a8a8a8;
-        border-radius: 10px;
+      background-color: #a8a8a8;
+      border-radius: 10px;
     }
 
     html.dark::-webkit-scrollbar-track,
     html.dark div.flex-grow::-webkit-scrollbar-track {
-        background-color: #090E15;
+      background-color: #090e15;
     }
 
     html.dark::-webkit-scrollbar-thumb,
     html.dark div.flex-grow::-webkit-scrollbar-thumb {
-        background-color: #24292e;
+      background-color: #24292e;
     }
 
     html.dark::-webkit-scrollbar-thumb:hover,
     html.dark div.flex-grow::-webkit-scrollbar-thumb:hover {
-        background-color: #3a3f44;
+      background-color: #3a3f44;
     }
 
     body {
diff --git a/main.js b/src/electron/main.js
similarity index 95%
rename from main.js
rename to src/electron/main.js
index d1fc79aeb..303bd0e8c 100644
--- a/main.js
+++ b/src/electron/main.js
@@ -13,13 +13,12 @@ const path = require('node:path');
 // TODO: Remove @electron/remote use - see #650
 require('@electron/remote/main').initialize();
 
-const idleIcon = path.join(
-  __dirname,
-  'assets',
-  'images',
-  'tray-idleTemplate.png',
+const idleIcon = path.resolve(
+  `${__dirname}/../../assets/images/tray-idleTemplate.png`,
+);
+const activeIcon = path.resolve(
+  `${__dirname}/../../assets/images/tray-active.png`,
 );
-const activeIcon = path.join(__dirname, 'assets', 'images', 'tray-active.png');
 
 const browserWindowOpts = {
   width: 500,
diff --git a/tsconfig.json b/tsconfig.json
index 99a01a632..d959bd763 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,11 +14,5 @@
     "types": ["jest"],
     "skipLibCheck": true
   },
-  "include": [
-    "src/**/*.js",
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "first-run.js",
-    "main.js"
-  ]
+  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.tsx"]
 }