diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..8f7026824
Binary files /dev/null and b/.DS_Store differ
diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 072c03a9e..e9b1e3d8c 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -68,23 +68,23 @@ tasks.named<ShadowJar>("shadowJar") {
 
     relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
     relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
-    relocate("io.papermc.lib", "com.plotsquared.bukkit.internal.paperlib")
-    relocate("org.bstats", "com.plotsquared.core.internal.metrics")
-    relocate("org.enginehub", "com.plotsquared.core.squirrelid")
-    relocate("org.khelekore.prtree", "com.plotsquared.core.prtree")
-    relocate("com.google.inject", "com.plotsquared.core.google")
-    relocate("org.aopalliance", "com.plotsquared.core.google.aopalliance")
-    relocate("cloud.commandframework.services", "com.plotsquared.core.cloud.services")
-    relocate("io.leangen.geantyref", "com.plotsquared.core.cloud.geantyref")
-    relocate("com.intellectualsites.arkitektonika", "com.plotsquared.core.web.arkitektonika")
-    relocate("com.intellectualsites.http", "com.plotsquared.core.web.http")
-    relocate("com.intellectualsites.paster", "com.plotsquared.core.web.paster")
-    relocate("org.incendo.serverlib", "com.plotsquared.bukkit.internal.serverlib")
-    relocate("org.jetbrains", "com.plotsquared.core.annotations.jetbrains.annotation")
-    relocate("org.intellij.lang", "com.plotsquared.core.annotations.intellij.annotations")
-    relocate("javax.annotation", "com.plotsquared.core.annotations.javax.annotation")
+    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
+    relocate("org.bstats", "com.plotsquared.metrics")
+    relocate("org.enginehub", "com.plotsquared.squirrelid")
+    relocate("org.khelekore.prtree", "com.plotsquared.prtree")
+    relocate("com.google.inject", "com.plotsquared.google")
+    relocate("org.aopalliance", "com.plotsquared.core.aopalliance")
+    relocate("cloud.commandframework.services", "com.plotsquared.core.services")
+    relocate("io.leangen.geantyref", "com.plotsquared.core.geantyref")
+    relocate("com.intellectualsites.arkitektonika", "com.plotsquared.core.arkitektonika")
+    relocate("com.intellectualsites.http", "com.plotsquared.core.http")
+    relocate("com.intellectualsites.paster", "com.plotsquared.core.paster")
+    relocate("org.incendo.serverlib", "com.plotsquared.bukkit.serverlib")
+    relocate("org.jetbrains", "com.plotsquared.core.annotations")
+    relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
+    relocate("javax.annotation", "com.plotsquared.core.annotation")
     relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
-    relocate("javax.inject", "com.plotsquared.core.annotations.javax.inject")
+    relocate("javax.inject", "com.plotsquared.core.annotation.inject")
     relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
     relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")