diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenManager.java b/app/src/main/java/com/displaynone/acss/components/auth/internal_utils/AuthTokenManager.java
similarity index 94%
rename from app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenManager.java
rename to app/src/main/java/com/displaynone/acss/components/auth/internal_utils/AuthTokenManager.java
index 78a6c77..1a782b5 100644
--- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenManager.java
+++ b/app/src/main/java/com/displaynone/acss/components/auth/internal_utils/AuthTokenManager.java
@@ -1,4 +1,4 @@
-package com.displaynone.acss.components.auth.models.user;
+package com.displaynone.acss.components.auth.internal_utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,6 +8,8 @@ import androidx.security.crypto.EncryptedSharedPreferences;
 import androidx.security.crypto.MasterKeys;
 
 
+import com.displaynone.acss.components.auth.models.AuthTokenPair;
+
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenPair.kt b/app/src/main/java/com/displaynone/acss/components/auth/models/AuthTokenPair.kt
similarity index 80%
rename from app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenPair.kt
rename to app/src/main/java/com/displaynone/acss/components/auth/models/AuthTokenPair.kt
index 7d73fc5..70a9bb6 100644
--- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenPair.kt
+++ b/app/src/main/java/com/displaynone/acss/components/auth/models/AuthTokenPair.kt
@@ -1,4 +1,4 @@
-package com.displaynone.acss.components.auth.models.user
+package com.displaynone.acss.components.auth.models
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/TokenManager.kt b/app/src/main/java/com/displaynone/acss/components/auth/models/user/TokenManager.kt
deleted file mode 100644
index 722d37b..0000000
--- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/TokenManager.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.displaynone.acss.components.auth.models.user
-
-class TokenManager {
-    //TODO()
-}
diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt b/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt
index 2172191..a369592 100644
--- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt
+++ b/app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt
@@ -1,6 +1,7 @@
 package com.displaynone.acss.components.auth.models.user
 
 import android.content.Context
+import com.displaynone.acss.components.auth.internal_utils.AuthTokenManager
 import com.displaynone.acss.components.auth.models.user.repository.UserRepository
 import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO
 
@@ -15,7 +16,10 @@ class UserServiceST(
 
         fun createInstance(context: Context) {
             if (instance == null) {
-                val tokenManager = AuthTokenManager(context)
+                val tokenManager =
+                    AuthTokenManager(
+                        context
+                    )
                 instance = UserServiceST(tokenManager)
             }
         }
diff --git a/app/src/main/java/com/displaynone/acss/components/auth/models/user/repository/UserRepository.kt b/app/src/main/java/com/displaynone/acss/components/auth/models/user/repository/UserRepository.kt
index 3ba045f..39634b5 100644
--- a/app/src/main/java/com/displaynone/acss/components/auth/models/user/repository/UserRepository.kt
+++ b/app/src/main/java/com/displaynone/acss/components/auth/models/user/repository/UserRepository.kt
@@ -1,13 +1,11 @@
 package com.displaynone.acss.components.auth.models.user.repository
 
 import android.util.Log
-import com.displaynone.acss.components.auth.models.user.AuthTokenManager
-import com.displaynone.acss.components.auth.models.user.AuthTokenPair
+import com.displaynone.acss.components.auth.models.AuthTokenPair
 import com.displaynone.acss.config.Constants.serverUrl
 import com.displaynone.acss.config.Network
 import com.displaynone.acss.components.auth.models.user.repository.dto.RegisterUserDto
 import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO
-import com.google.gson.Gson
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.headers
@@ -24,8 +22,6 @@ import io.ktor.http.encodeURLPath
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlin.math.log
 
 class UserRepository(