diff --git a/src/main/java/icu/samnyan/aqua/AquaServerApplication.kt b/src/main/java/icu/samnyan/aqua/AquaServerApplication.kt
index c7500a32..c3bd3824 100644
--- a/src/main/java/icu/samnyan/aqua/AquaServerApplication.kt
+++ b/src/main/java/icu/samnyan/aqua/AquaServerApplication.kt
@@ -1,6 +1,6 @@
 package icu.samnyan.aqua
 
-import icu.samnyan.aqua.net.utils.EmailService
+import icu.samnyan.aqua.net.components.EmailService
 import icu.samnyan.aqua.sega.aimedb.AimeDbServer
 import icu.samnyan.aqua.spring.util.AutoChecker
 import org.springframework.boot.SpringApplication
diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
index a85d0e89..e9b4fcf6 100644
--- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -3,8 +3,8 @@ package icu.samnyan.aqua.net
 import ext.*
 import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.utils.GeoIP
-import icu.samnyan.aqua.net.utils.TurnstileService
+import icu.samnyan.aqua.net.components.GeoIP
+import icu.samnyan.aqua.net.components.TurnstileService
 import jakarta.servlet.http.HttpServletRequest
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.web.bind.annotation.PostMapping
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/Email.kt b/src/main/java/icu/samnyan/aqua/net/components/Email.kt
similarity index 94%
rename from src/main/java/icu/samnyan/aqua/net/utils/Email.kt
rename to src/main/java/icu/samnyan/aqua/net/components/Email.kt
index e74fe17c..c2f7776d 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/Email.kt
+++ b/src/main/java/icu/samnyan/aqua/net/components/Email.kt
@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package icu.samnyan.aqua.net.components
 
 import ext.Bool
 import ext.Str
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/GeoIP.kt b/src/main/java/icu/samnyan/aqua/net/components/GeoIP.kt
similarity index 95%
rename from src/main/java/icu/samnyan/aqua/net/utils/GeoIP.kt
rename to src/main/java/icu/samnyan/aqua/net/components/GeoIP.kt
index dfd300f1..b1913e9c 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/GeoIP.kt
+++ b/src/main/java/icu/samnyan/aqua/net/components/GeoIP.kt
@@ -1,8 +1,7 @@
-package icu.samnyan.aqua.net.utils
+package icu.samnyan.aqua.net.components
 
 import com.maxmind.geoip2.DatabaseReader
 import com.maxmind.geoip2.exception.AddressNotFoundException
-import ext.Bool
 import ext.Str
 import jakarta.annotation.PostConstruct
 import jakarta.servlet.http.HttpServletRequest
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/JWT.kt b/src/main/java/icu/samnyan/aqua/net/components/JWT.kt
similarity index 94%
rename from src/main/java/icu/samnyan/aqua/net/utils/JWT.kt
rename to src/main/java/icu/samnyan/aqua/net/components/JWT.kt
index cdce3093..bdee530f 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/JWT.kt
+++ b/src/main/java/icu/samnyan/aqua/net/components/JWT.kt
@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package icu.samnyan.aqua.net.components
 
 import ext.Str
 import icu.samnyan.aqua.net.db.AquaNetUser
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt b/src/main/java/icu/samnyan/aqua/net/components/Turnstile.kt
similarity index 90%
rename from src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt
rename to src/main/java/icu/samnyan/aqua/net/components/Turnstile.kt
index 84013050..642cf74b 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt
+++ b/src/main/java/icu/samnyan/aqua/net/components/Turnstile.kt
@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package icu.samnyan.aqua.net.components
 
 import ext.Bool
 import ext.HTTP
@@ -7,7 +7,6 @@ import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.http.*
-import jakarta.servlet.http.HttpServletRequest
 import kotlinx.serialization.Serializable
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Configuration