diff --git a/.env_example b/.env_example
new file mode 100644
index 0000000..edbbab9
--- /dev/null
+++ b/.env_example
@@ -0,0 +1,2 @@
+API_KEY="YOUR_API_KEY"
+API_SECRET="YOUR_API_SECRET"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 169f98c..9a8091d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ Archive.zip
 dev-resources
 content copy.js
 aula-fixer_v1-2.zip
-.env
\ No newline at end of file
+.env
+
+web-ext-artifacts
\ No newline at end of file
diff --git a/Aula-Fixer.crx b/Aula-Fixer.crx
deleted file mode 100644
index 28a59e9..0000000
Binary files a/Aula-Fixer.crx and /dev/null differ
diff --git a/build_scripts/build.sh b/build_scripts/build.sh
new file mode 100755
index 0000000..282dc8f
--- /dev/null
+++ b/build_scripts/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+web-ext build --source-dir=./src --artifacts-dir=./web-ext-artifacts
\ No newline at end of file
diff --git a/build_scripts/build_ff_listed.sh b/build_scripts/build_ff_listed.sh
index 33fc7f9..55ed740 100755
--- a/build_scripts/build_ff_listed.sh
+++ b/build_scripts/build_ff_listed.sh
@@ -1,6 +1,10 @@
-cd ..
+#!/usr/bin/env bash
+
+source .env
+
+cd src
 mv manifest.json manifest_temp.json
 mv manifest_ff.json manifest.json
-web-ext sign --channel=listed --api-key=user: --api-secret=
+web-ext sign --channel=listed --api-key=user:$API_KEY --api-secret=$API_SECRET
 mv manifest.json manifest_ff.json
 mv manifest_temp.json manifest.json
\ No newline at end of file
diff --git a/build_scripts/build_ff_unlisted.sh b/build_scripts/build_ff_unlisted.sh
index 776e88f..4b7d1df 100755
--- a/build_scripts/build_ff_unlisted.sh
+++ b/build_scripts/build_ff_unlisted.sh
@@ -1,6 +1,10 @@
-cd ..
+#!/usr/bin/env bash
+
+source .env
+
+cd src
 mv manifest.json manifest_temp.json
 mv manifest_ff.json manifest.json
-web-ext sign --channel=unlisted --api-key=user: --api-secret=
+web-ext sign --channel=unlisted --api-key=user:$API_KEY --api-secret=$API_SECRET
 mv manifest.json manifest_ff.json
 mv manifest_temp.json manifest.json
\ No newline at end of file
diff --git a/background.js b/src/background.js
similarity index 96%
rename from background.js
rename to src/background.js
index 76560de..43f71cf 100644
--- a/background.js
+++ b/src/background.js
@@ -1,7 +1,7 @@
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
     if (request.type === "GET_KEYWORDS") {
 
-        const remoteUrl = "https://git.wbell.dev/TussockyJoker/Aula-Fixer/raw/branch/main/keywords.txt";
+        const remoteUrl = "https://git.wbell.dev/TussockyJoker/Aula-Fixer/raw/branch/main/src/keywords.txt";
         const localUrl = chrome.runtime.getURL("keywords.txt");
 
         // remote
diff --git a/content.js b/src/content.js
similarity index 100%
rename from content.js
rename to src/content.js
diff --git a/keywords.txt b/src/keywords.txt
similarity index 100%
rename from keywords.txt
rename to src/keywords.txt
diff --git a/manifest.json b/src/manifest.json
similarity index 100%
rename from manifest.json
rename to src/manifest.json
diff --git a/manifest_chrome.json b/src/manifest_chrome.json
similarity index 100%
rename from manifest_chrome.json
rename to src/manifest_chrome.json
diff --git a/manifest_ff.json b/src/manifest_ff.json
similarity index 100%
rename from manifest_ff.json
rename to src/manifest_ff.json
diff --git a/web-ext-artifacts/aula_fixer-1.3.xpi b/web-ext-artifacts/aula_fixer-1.3.xpi
deleted file mode 100644
index e18f014..0000000
Binary files a/web-ext-artifacts/aula_fixer-1.3.xpi and /dev/null differ