diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 880d0c44..45100e11 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -58,8 +58,6 @@ subprojects {
         // MySQL connector, shaded into the legacy jar
         implementation("com.mysql:mysql-connector-j:8.4.0")
         implementation("org.mariadb.jdbc:mariadb-java-client:3.3.3")
-        // Argon2 implementation
-        implementation("de.mkammerer:argon2-jvm-nolibs:2.11")
         // TOTP client
         implementation("com.warrenstrange:googleauth:1.5.0")
         // Keep in sync with spigot 1.19
@@ -134,7 +132,6 @@ subprojects {
             relocate("org.picketbox", "${project.group}.libs.org.picketbox")
             relocate("org.jboss.crypto", "${project.group}.libs.org.jboss.crypto")
             relocate("org.jboss.security", "${project.group}.libs.org.jboss.security")
-            relocate("de.mkammerer", "${project.group}.libs.de.mkammerer")
             relocate("com.warrenstrange", "${project.group}.libs.com.warrenstrange")
             relocate("javax.inject", "${project.group}.libs.javax.inject")
             relocate("at.favre.lib", "${project.group}.libs.at.favre.lib")
diff --git a/project/module-common/build.gradle.kts b/project/module-common/build.gradle.kts
index fe6a62d9..284bfe5d 100644
--- a/project/module-common/build.gradle.kts
+++ b/project/module-common/build.gradle.kts
@@ -1,7 +1,6 @@
 dependencies {
     compileOnly(project(":project:module-util"))
     compileOnly(project(":project:module-logger"))
-    compileOnly(project(":project:module-security"))
     compileOnly(libs.configme)
     compileOnly(libs.guava)
 }
\ No newline at end of file
diff --git a/project/module-security/build.gradle.kts b/project/module-security/build.gradle.kts
index a89b2d62..c484b706 100644
--- a/project/module-security/build.gradle.kts
+++ b/project/module-security/build.gradle.kts
@@ -1,6 +1,7 @@
 dependencies {
     compileOnly(project(":project:module-util"))
     compileOnly(project(":project:module-logger"))
+    compileOnly(project(":project:module-common"))
     compileOnly(libs.guava)
     compileOnly(libs.configme)
     compileOnly(libs.jalu.injector)
@@ -8,9 +9,12 @@ dependencies {
     implementation("de.rtner:PBKDF2:1.1.4")
     // BCrypt implementation
     implementation("at.favre.lib:bcrypt:0.10.2")
+    // Argon2 implementation
+    implementation("de.mkammerer:argon2-jvm-nolibs:2.11")
 }
 
 tasks.shadowJar {
     relocate("de.rtner", "${project.group}.libs.de.rtner")
     relocate("at.favre.lib", "${project.group}.libs.at.favre.lib")
+    relocate("de.mkammerer", "${project.group}.libs.de.mkammerer")
 }
\ No newline at end of file
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/DependentTag.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/DependentTag.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/DependentTag.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/DependentTag.java
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/SimpleTag.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/SimpleTag.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/SimpleTag.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/SimpleTag.java
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/Tag.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/Tag.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/Tag.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/Tag.java
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/TagBuilder.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/TagBuilder.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/TagBuilder.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/TagBuilder.java
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/TagReplacer.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/TagReplacer.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/TagReplacer.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/TagReplacer.java
diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/WrappedTagReplacer.java b/project/module-util/src/main/java/fr/xephi/authme/util/lazytags/WrappedTagReplacer.java
similarity index 100%
rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/lazytags/WrappedTagReplacer.java
rename to project/module-util/src/main/java/fr/xephi/authme/util/lazytags/WrappedTagReplacer.java