diff --git a/pom.xml b/pom.xml
index 845f71bb87..37ce5f9250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
runelite-client
runelite-mixins
runelite-script-assembler-plugin
- runelite-scripts
runescape-api
http-api
http-service
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index d3a350841b..64baa666fa 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -108,12 +108,6 @@
${project.version}
runtime
-
- net.runelite
- scripts
- ${project.version}
- runtime
-
net.runelite
http-api
@@ -277,6 +271,33 @@
${project.build.directory}/${project.artifactId}-${project.version}-shaded.${project.packaging}
+
+ net.runelite
+ script-assembler-plugin
+ ${project.version}
+
+
+ assemble
+
+ assemble
+
+
+ src/main/scripts
+ ${project.build.outputDirectory}/runelite
+
+
+
+ build-index
+
+ build-index
+
+
+ ${project.build.outputDirectory}/runelite
+ ${project.build.outputDirectory}/runelite/index
+
+
+
+
diff --git a/runelite-scripts/scripts/BankSearchFilter.hash b/runelite-client/src/main/scripts/BankSearchFilter.hash
similarity index 100%
rename from runelite-scripts/scripts/BankSearchFilter.hash
rename to runelite-client/src/main/scripts/BankSearchFilter.hash
diff --git a/runelite-scripts/scripts/BankSearchFilter.rs2asm b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/BankSearchFilter.rs2asm
rename to runelite-client/src/main/scripts/BankSearchFilter.rs2asm
diff --git a/runelite-scripts/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash
similarity index 100%
rename from runelite-scripts/scripts/BankSearchLayout.hash
rename to runelite-client/src/main/scripts/BankSearchLayout.hash
diff --git a/runelite-scripts/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/BankSearchLayout.rs2asm
rename to runelite-client/src/main/scripts/BankSearchLayout.rs2asm
diff --git a/runelite-scripts/scripts/ChatboxInput.hash b/runelite-client/src/main/scripts/ChatboxInput.hash
similarity index 100%
rename from runelite-scripts/scripts/ChatboxInput.hash
rename to runelite-client/src/main/scripts/ChatboxInput.hash
diff --git a/runelite-scripts/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/ChatboxInput.rs2asm
rename to runelite-client/src/main/scripts/ChatboxInput.rs2asm
diff --git a/runelite-scripts/scripts/ChatboxInputHandler.rs2asm b/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/ChatboxInputHandler.rs2asm
rename to runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm
diff --git a/runelite-scripts/scripts/ChatboxInputInit.rs2asm b/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/ChatboxInputInit.rs2asm
rename to runelite-client/src/main/scripts/ChatboxInputInit.rs2asm
diff --git a/runelite-scripts/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash
similarity index 100%
rename from runelite-scripts/scripts/CommandScript.hash
rename to runelite-client/src/main/scripts/CommandScript.hash
diff --git a/runelite-scripts/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/CommandScript.rs2asm
rename to runelite-client/src/main/scripts/CommandScript.rs2asm
diff --git a/runelite-scripts/scripts/OpenBankSearchInput.hash b/runelite-client/src/main/scripts/OpenBankSearchInput.hash
similarity index 100%
rename from runelite-scripts/scripts/OpenBankSearchInput.hash
rename to runelite-client/src/main/scripts/OpenBankSearchInput.hash
diff --git a/runelite-scripts/scripts/OpenBankSearchInput.rs2asm b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/OpenBankSearchInput.rs2asm
rename to runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelRebuilder.hash
rename to runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm
rename to runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
diff --git a/runelite-scripts/scripts/OptionsPanelZoomMouseListener.hash b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelZoomMouseListener.hash
rename to runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash
diff --git a/runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm
rename to runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
diff --git a/runelite-scripts/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelZoomUpdater.hash
rename to runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
diff --git a/runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm
rename to runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
diff --git a/runelite-scripts/scripts/PrivateMessage.hash b/runelite-client/src/main/scripts/PrivateMessage.hash
similarity index 100%
rename from runelite-scripts/scripts/PrivateMessage.hash
rename to runelite-client/src/main/scripts/PrivateMessage.hash
diff --git a/runelite-scripts/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/PrivateMessage.rs2asm
rename to runelite-client/src/main/scripts/PrivateMessage.rs2asm
diff --git a/runelite-scripts/scripts/ScrollWheelZoomHandler.hash b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash
similarity index 100%
rename from runelite-scripts/scripts/ScrollWheelZoomHandler.hash
rename to runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash
diff --git a/runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm
rename to runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
diff --git a/runelite-scripts/scripts/SendPrivateMessage.rs2asm b/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/SendPrivateMessage.rs2asm
rename to runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
diff --git a/runelite-scripts/scripts/SetBankItemMenu.hash b/runelite-client/src/main/scripts/SetBankItemMenu.hash
similarity index 100%
rename from runelite-scripts/scripts/SetBankItemMenu.hash
rename to runelite-client/src/main/scripts/SetBankItemMenu.hash
diff --git a/runelite-scripts/scripts/SetBankItemMenu.rs2asm b/runelite-client/src/main/scripts/SetBankItemMenu.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/SetBankItemMenu.rs2asm
rename to runelite-client/src/main/scripts/SetBankItemMenu.rs2asm
diff --git a/runelite-scripts/scripts/null.rs2asm b/runelite-client/src/main/scripts/null.rs2asm
similarity index 100%
rename from runelite-scripts/scripts/null.rs2asm
rename to runelite-client/src/main/scripts/null.rs2asm
diff --git a/runelite-scripts/pom.xml b/runelite-scripts/pom.xml
deleted file mode 100644
index ac7206f385..0000000000
--- a/runelite-scripts/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
- 4.0.0
-
-
- net.runelite
- runelite-parent
- 1.4.9-SNAPSHOT
-
-
- scripts
- RuneLite Scripts
-
-
-
-
- net.runelite
- script-assembler-plugin
- ${project.version}
-
-
- assemble
-
- assemble
-
-
- ${project.basedir}/scripts
- ${project.build.outputDirectory}/runelite
-
-
-
- build-index
-
- build-index
-
-
- ${project.build.outputDirectory}/runelite
- ${project.build.outputDirectory}/runelite/index
-
-
-
-
-
-
-