diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
index 4f2918c44c801b0fade1b52a0f29a5f776529d2b..19f70cb15a585942a8b8fcf3d5ebb707629c0b15 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
@@ -11,12 +11,12 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.runBlocking
-import net.novagamestudios.common_utils.android.toastShort
 import net.novagamestudios.common_utils.compose.application
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.toastShort
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerAPI
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerScraper
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
index cf3fc51985ec182818aadb7f4aff157719f431fe..6b8dea1428cedd6b17a131ce68baef70c64191f9 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.logging.LocalLogger
+import net.novagamestudios.common_utils.compose.logging.LocalLogger
 import net.novagamestudios.kaffeekasse.repositories.SettingsRepository
 import net.novagamestudios.kaffeekasse.ui.App
 import net.novagamestudios.kaffeekasse.ui.util.removeScrollableTabRowMinimumTabWidth
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
index a671abee299f94f76bcb9d7847e861ac8f23471f..aa986abd0fd0a6296985ac087ed4e5ccc3a41f32 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
@@ -3,8 +3,8 @@ package net.novagamestudios.kaffeekasse
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.info
 
 
 class UpdateReceiver : BroadcastReceiver(), Logger {
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
index e9b9fc0aa252f141cc8e47bc62dcb69def0b11d3..851dee7a974eeb52944e87421dd88220f74e4d56 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.api.hiwi_tracker
 
 import io.ktor.http.parameters
 import kotlinx.datetime.format
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.model.MonthDataResponse
 import net.novagamestudios.kaffeekasse.api.portal.PortalClient
 import net.novagamestudios.kaffeekasse.model.hiwi_tracker.MonthKey
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
index 67c37a6938104df782f84b467a1f63bf48fde274..c56c39267aca9e6429193c79da859ceb06254e83 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
@@ -3,9 +3,9 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse
 import io.ktor.http.Parameters
 import io.ktor.http.parameters
 import io.ktor.util.sha1
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.ItemListResponse
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.KaffeekasseAPIResponse
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.LoggedInUserResponse
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
index 75cdb85653bab36de3bc608bc063d79e7e03491e..7f8949703798d28f0b6507f5470f9930c9977bce 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
@@ -12,7 +12,7 @@ import it.skrape.selects.html5.select
 import it.skrape.selects.html5.table
 import it.skrape.selects.html5.td
 import it.skrape.selects.html5.tr
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.info
 import net.novagamestudios.kaffeekasse.api.portal.PortalClient
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.KnownItem
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
index fee012cba5e8300c6293fe12821f8f5cac30daee..e53f53fd234dd0e38b10b3c358790d5fe6b5e1c5 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import net.novagamestudios.common_utils.serialization.BooleanAsIntSerializer
+import net.novagamestudios.common_utils.core.serialization.BooleanAsIntSerializer
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Name
 
 @Serializable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
index 3bcb65e111f9cb0c3c8b2fea8d196bd2c0851743..a7e6201e40ed7f32503db30502bde7e9dd24e92a 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
@@ -3,7 +3,7 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse.model
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
-import net.novagamestudios.common_utils.serialization.BooleanAsIntSerializer
+import net.novagamestudios.common_utils.core.serialization.BooleanAsIntSerializer
 
 @Serializable
 data class ItemListResponse(
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
index 722892d66f83c314f26370994e4202e2a3b91a8b..16c94081882eadabc6efbef0f6a540f0326428c1 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
@@ -33,12 +33,12 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.decodeFromJsonElement
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
+import net.novagamestudios.common_utils.core.logging.warn
 import net.novagamestudios.kaffeekasse.api.portal.model.PortalAPIResponse
 import net.novagamestudios.kaffeekasse.model.credentials.Login
 import net.novagamestudios.kaffeekasse.model.credentials.isValid
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
index aaa951c0ac14d6fa232cf8541a004350cc8ec296..76a55c36fad0938b6147457a84bcb989df10df2d 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
@@ -8,7 +8,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import net.novagamestudios.common_utils.format
+import net.novagamestudios.common_utils.core.format
 import net.novagamestudios.kaffeekasse.BuildConfig
 
 
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
index 9c41025c31aaacc45a53abec1d0472d31c3691e6..2c57b073f76c2c51a382273d6a064566243bb772 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
@@ -6,7 +6,7 @@ import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
 import kotlinx.datetime.number
 import kotlinx.serialization.Serializable
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 
 
 @Serializable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
index 75612ddf0e75a14721457768316ceef51fa7e8ad..6765ead7935be92c423b8739c1b6c339864301c0 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.model.hiwi_tracker
 
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime
-import net.novagamestudios.common_utils.minus
+import net.novagamestudios.common_utils.core.minus
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
index 4e28f13c46adbeb880883c7ead3a88d929777be1..d6294731598d5a7aec88c03588d7aa2af6ca5e59 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
@@ -11,12 +11,12 @@ import androidx.credentials.exceptions.CreateCredentialException
 import androidx.credentials.exceptions.CreateCredentialUnsupportedException
 import androidx.credentials.exceptions.GetCredentialCancellationException
 import androidx.credentials.exceptions.GetCredentialException
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.toastShort
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
 import net.novagamestudios.kaffeekasse.BuildConfig
 import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
 import net.novagamestudios.kaffeekasse.model.credentials.Login
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
index 61fd147d4e9d45de83b0a60cca7b4bd009ddb60c..b71165b8559f74d8e735cfa12a949fcbbddc58b7 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
@@ -4,14 +4,14 @@ import android.content.Context
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.sync.Mutex
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.collection.mapState
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
-import net.novagamestudios.common_utils.logging.warn
-import net.novagamestudios.common_utils.withReentrantLock
+import net.novagamestudios.common_utils.core.toastShort
+import net.novagamestudios.common_utils.core.collection.mapState
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.withReentrantLock
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.BasicUserInfo
 import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
index 940db21350e34b6bfad9ea790d303bb45b369a17..944427c609fa9ae0779728bc81fd857f05733e20 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.serializer
 import net.novagamestudios.common_utils.compose.state.DataStoreState
 import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
 import net.novagamestudios.common_utils.compose.state.stateIn
-import net.novagamestudios.common_utils.serialization.JsonToDataStore
+import net.novagamestudios.common_utils.compose.JsonToDataStore
 import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
 import net.novagamestudios.kaffeekasse.ui.util.derived
 import java.io.File
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
index 3ebfeb3bb49aaf1bc3a5e9d803bcbf411beb5a4d..88c87f012e9400503f686e1eb32c614ff998a59e 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
@@ -1,7 +1,7 @@
 package net.novagamestudios.kaffeekasse.repositories
 
 import kotlinx.coroutines.flow.StateFlow
-import net.novagamestudios.common_utils.collection.mapState
+import net.novagamestudios.common_utils.core.collection.mapState
 import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
 import net.novagamestudios.kaffeekasse.model.session.realUserOrNull
 
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
index ffcc855c3860902a4f7dad3326886aa3b7dcc4bd..392d5a38b8b8faa9de6aefbfcde8800ed313464e 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
@@ -11,11 +11,11 @@ import io.ktor.http.contentLength
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.jvm.javaio.copyTo
 import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.compose.components.Progress
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
 import net.novagamestudios.kaffeekasse.MainActivity
 import net.novagamestudios.kaffeekasse.UpdateReceiver
 import net.novagamestudios.kaffeekasse.model.app.AppRelease
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
index 8dc5bab4cbee58de04d0475a4d4d0d3c094d52fc..fdbb13af57886328d4e687437d9f3e3998ed92cb 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
@@ -1,8 +1,8 @@
 package net.novagamestudios.kaffeekasse.repositories.i11
 
 import kotlinx.coroutines.CoroutineScope
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerAPI
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerScraper
 import net.novagamestudios.kaffeekasse.api.hiwi_tracker.model.MonthDataResponse
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
index 3a1e29b5f1146b72d486263ecd711f10f01331e4..80e492349013029e7696e38c69ac0e28a9107dc8 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
@@ -3,7 +3,7 @@ package net.novagamestudios.kaffeekasse.repositories.i11
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseScraper
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.APIPurchaseAccount
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
index 99a376d330f0b2a0b4d7192aa7d8117c1f733291..e2437e33f45d0f17acb088833f8d8be125a32748 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
@@ -4,10 +4,10 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
 import net.novagamestudios.kaffeekasse.api.portal.PortalClient
 import net.novagamestudios.kaffeekasse.model.credentials.Login
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
index ca0aae25ffd2c3d776c4b586bd6a89955a86800a..40a7be7fd226702f917a78c5427e822f131e8614 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
@@ -1,9 +1,9 @@
 package net.novagamestudios.kaffeekasse.repositories.releases
 
 import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
 import net.novagamestudios.kaffeekasse.gitlab.GitLab
 import net.novagamestudios.kaffeekasse.gitlab.GitLabPackage
 import net.novagamestudios.kaffeekasse.gitlab.GitLabPackageFile
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
index 52cdbc8e12b0ae0cda3c9b879fa04cd3e8ce4e2e..135d95767dc99c6cc0fbc1cb8f9c800577c4e967 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
@@ -1,9 +1,9 @@
 package net.novagamestudios.kaffeekasse.repositories.releases
 
 import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
 import net.novagamestudios.kaffeekasse.gitlab.GitLab
 import net.novagamestudios.kaffeekasse.model.app.AppRelease
 import net.novagamestudios.kaffeekasse.model.app.AppVersion
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
index 9ff0445c9c3989572b3b387589a9ee20159ff8b1..89145a53f320abe9b775e63a4cad77662415a53b 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
@@ -17,10 +17,10 @@ import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
 import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.LoggerForFun
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.compose.logging.verbose
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.LoggerForFun
+import net.novagamestudios.common_utils.core.logging.debug
 import net.novagamestudios.common_utils.voyager.model.GlobalScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
index 1c8dad9e7406b699431219245aa317602103a571..a48c0dc30d1a42a130b76c24d01b184823341495 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
@@ -46,7 +46,7 @@ import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.android.toastLong
+import net.novagamestudios.common_utils.core.toastLong
 import net.novagamestudios.common_utils.compose.DashedShape
 import net.novagamestudios.common_utils.compose.Toasts
 import net.novagamestudios.common_utils.compose.ToastsState
@@ -57,8 +57,8 @@ import net.novagamestudios.common_utils.compose.components.RowCenter
 import net.novagamestudios.common_utils.compose.components.TransparentListItem
 import net.novagamestudios.common_utils.compose.state.ReentrantActionState
 import net.novagamestudios.common_utils.compose.state.collectAsStateIn
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.error
 import net.novagamestudios.common_utils.voyager.model.GlobalScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.common_utils.voyager.model.getValue
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
index 9c20b6fa47f410d68c0ecbe0df53422e39a16a93..ea64958f06e8247d3dd69310a7af94880914c103 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
@@ -82,9 +82,9 @@ import net.novagamestudios.common_utils.compose.components.ColumnCenter
 import net.novagamestudios.common_utils.compose.components.RowCenter
 import net.novagamestudios.common_utils.compose.state.ReentrantActionState
 import net.novagamestudios.common_utils.compose.thenIf
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
-import net.novagamestudios.common_utils.minus
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.minus
 import net.novagamestudios.kaffeekasse.R
 import net.novagamestudios.kaffeekasse.model.hiwi_tracker.WorkEntry
 import net.novagamestudios.kaffeekasse.model.hiwi_tracker.WorkEntry.Companion.MaxWorkWithoutLargeBreak
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
index e236ab51adc78aec98389a17cdd66e357bb2f239..b7b6251991f932e1fa362b53217c8ed8b8583574 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
@@ -1,7 +1,7 @@
 package net.novagamestudios.kaffeekasse.ui.hiwi_tracker
 
 import cafe.adriel.voyager.core.model.ScreenModel
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.kaffeekasse.model.session.Session
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
index 3917787df2669c15e2b4fe9559f80591c9887156..3c436cc8c78aa054159b1ec830c448e7694079aa 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
@@ -85,9 +85,9 @@ import net.novagamestudios.common_utils.compose.DashedShape
 import net.novagamestudios.common_utils.compose.components.BoxCenter
 import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
 import net.novagamestudios.common_utils.compose.components.RowCenter
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.verbose
 import net.novagamestudios.common_utils.voyager.BackNavigationHandler
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
index 4934d911edb1583afbfbc6f39dbc341bd3eb7cbe..62990eff7e8156c1b3c925f07f2c4d516009d8bb 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
@@ -28,8 +28,8 @@ import cafe.adriel.voyager.navigator.Navigator
 import net.novagamestudios.common_utils.compose.components.BoxCenter
 import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
 import net.novagamestudios.common_utils.compose.components.ColumnCenter
-import net.novagamestudios.common_utils.format
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.format
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Account
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
index 1271439e355097a413a93eb7953d33bf1501134e..8addd6169fe228062390b5666d6397d18d5ebee4 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
@@ -10,7 +10,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.BackNavigationHandler
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
index bbdd9751f76d847c1931e7b3767603b721e56d12..82f628e2659b7ef255482f2e0a74c4b29d4bb52a 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
@@ -39,7 +39,7 @@ import cafe.adriel.voyager.navigator.Navigator
 import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
 import net.novagamestudios.common_utils.compose.components.RowCenter
 import net.novagamestudios.common_utils.compose.tabIndicatorOffset
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.kaffeekasse.KaffeekasseModule.Companion.kaffeekasseCartProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
index 7edd7f217b28e879caed126757bea36274c2c02d..28021042b1f8e2f7476968a9e517e9a49f92b465 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.kaffeekasse.App
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
index ade4aa7eeb054c6499455ca6c32a9c5a63986ce6..324bebcc1b205e0701790fcc3030ce1397a40e10 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
@@ -76,8 +76,9 @@ import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
+import net.novagamestudios.common_utils.compose.logging.debug
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.ItemCategory
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Transaction
 import net.novagamestudios.kaffeekasse.ui.kaffeekasse.TransactionsChartsState.ChartSettings.TimeFilter
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
index e91a08b99a78aac10391df5e4d55fbcf2290d2ea..86f16fe047ab59742f1d23c87fc186e759b8208a 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
@@ -20,7 +20,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.android.toastShort
+import net.novagamestudios.common_utils.core.toastShort
 import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
 import net.novagamestudios.kaffeekasse.App.Companion.settings
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
index b809438ec9c1c879c17b9534b72f7fb34e071881..4ee7261765e3dbae9385b56e39f655f28b3d2cf7 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
@@ -55,8 +55,8 @@ import net.novagamestudios.common_utils.compose.components.CircularLoadingBox
 import net.novagamestudios.common_utils.compose.components.TransparentListItem
 import net.novagamestudios.common_utils.compose.maskedCircleIcon
 import net.novagamestudios.common_utils.compose.state.ReentrantActionState
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.warn
 import net.novagamestudios.kaffeekasse.KaffeekasseModule.Companion.kaffeekasseCartProvider
 import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.APIPurchaseAccount
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
index 6b65b4bd1a7a06b136187a3b011214c941f9eb3c..6cdd090a0365270a29f899b611b9fcb4e5428be6 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
@@ -31,11 +31,11 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.compose.DashedShape
 import net.novagamestudios.common_utils.compose.components.ColumnCenter
 import net.novagamestudios.common_utils.compose.state.ReentrantActionState
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.logging.verbose
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Item
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.MutableCart
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Transaction
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
index 509a4f4bc7ff87486e1267137a58f0de892b969d..37864ed1fd50ce6874f077fa5cdc679feb541a4c 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
@@ -54,9 +54,9 @@ import io.ktor.http.URLBuilder
 import io.ktor.http.URLProtocol
 import net.novagamestudios.common_utils.compose.components.BoxCenter
 import net.novagamestudios.common_utils.compose.maskedCircleIcon
-import net.novagamestudios.common_utils.logging.LocalLogger
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.compose.logging.LocalLogger
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
 import net.novagamestudios.kaffeekasse.App
 import net.novagamestudios.kaffeekasse.app
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Item
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
index e88727d079100729346c3e7977b521d6e6857392..2af11fecfc0ebf2b87f18181e266fdd7e91fdb79 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
@@ -13,12 +13,12 @@ import cafe.adriel.voyager.core.model.screenModelScope
 import cafe.adriel.voyager.navigator.Navigator
 import kotlinx.coroutines.launch
 import net.novagamestudios.common_utils.compose.components.CircularLoadingBox
-import net.novagamestudios.common_utils.compose.components.scaffold.currentScaffoldContent
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.BackNavigationHandler
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
+import net.novagamestudios.common_utils.voyager.scaffold.currentScaffoldContent
 import net.novagamestudios.kaffeekasse.app
 import net.novagamestudios.kaffeekasse.model.session.Session
 import net.novagamestudios.kaffeekasse.repositories.LoginRepository
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
index ade5e1c1041096710363351b0716016e5bcf05cf..ab20f8e89be9aa90cd10aaf06a3448e99dc15721 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
@@ -50,7 +50,7 @@ import cafe.adriel.voyager.core.model.screenModelScope
 import cafe.adriel.voyager.navigator.Navigator
 import kotlinx.coroutines.launch
 import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
index 14275b2c9e8653e7fecbeef68d663ade8e10b9c4..7f8839e7c4926f5164e553f5b4e5ef2d545ccd5b 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
@@ -71,9 +71,10 @@ import net.novagamestudios.common_utils.compose.Toasts
 import net.novagamestudios.common_utils.compose.ToastsState
 import net.novagamestudios.common_utils.compose.components.LinearProgressIndicator
 import net.novagamestudios.common_utils.compose.components.RowCenter
+import net.novagamestudios.common_utils.compose.logging.warn
 import net.novagamestudios.common_utils.compose.state.rememberDerivedStateOf
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.voyager.BackNavigationHandler
 import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.kaffeekasse.App
@@ -99,7 +100,6 @@ import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchAction
 import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchField
 import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchFieldState
 import net.novagamestudios.kaffeekasse.ui.util.VerticalSelectionBar
-import net.novagamestudios.common_utils.voyager.BackNavigationHandler
 import net.novagamestudios.kaffeekasse.ui.util.pullToRefresh
 import net.novagamestudios.kaffeekasse.util.richdata.asRichDataFlow
 import net.novagamestudios.kaffeekasse.util.richdata.combineRich
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
index 0b18171354edbf72b6501aab9c127e73eeabe64a..b08968d79f74c96dc4d9e16bec8f2d427316aadb 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
@@ -16,12 +16,12 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.compose.components.scaffold.TopAppBar
-import net.novagamestudios.common_utils.compose.components.scaffold.TopAppBarContent
 import net.novagamestudios.common_utils.compose.nestedScroll
 import net.novagamestudios.common_utils.voyager.AnimatedBackNavigationIcon
 import net.novagamestudios.common_utils.voyager.debugNavigation
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
+import net.novagamestudios.common_utils.voyager.scaffold.TopAppBar
+import net.novagamestudios.common_utils.voyager.scaffold.TopAppBarContent
 import net.novagamestudios.kaffeekasse.CrashHandling
 import net.novagamestudios.kaffeekasse.ui.theme.LocalAnimationSwitch
 import net.novagamestudios.kaffeekasse.ui.theme.ifAnimationsEnabled
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
index a3da37d2e9d46fb81e54644b99f5d0985e15786c..82e8640d4c8b98f6e4c792e2b88107917c02e6ef 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
@@ -13,9 +13,9 @@ import cafe.adriel.voyager.navigator.tab.Tab
 import cafe.adriel.voyager.navigator.tab.TabNavigator
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.compose.components.scaffold.ScaffoldContentProvider
 import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
 import net.novagamestudios.common_utils.voyager.model.getValue
+import net.novagamestudios.common_utils.voyager.scaffold.ScaffoldContentProvider
 import net.novagamestudios.common_utils.voyager.screen.ScreenWithModel
 import net.novagamestudios.kaffeekasse.model.session.Device
 import net.novagamestudios.kaffeekasse.model.session.Session
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
index 0b98aa8ed0a4d28422ef1c1a88b0f580ac44c891..6eb7466f2011d17d575de338740646a28ebf3321 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
@@ -21,9 +21,9 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import io.ktor.http.Url
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.logging.LoggerForFun
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.LoggerForFun
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.toastShort
 
 
 @Composable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
index e66a320aa3373b36a13c00de9a03d6f7499ff939..fe9cd91c849f9bd9e34822dbaf4f81dff9304c68 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.flow.transformLatest
-import net.novagamestudios.common_utils.collection.mapState
+import net.novagamestudios.common_utils.core.collection.mapState
 import net.novagamestudios.common_utils.compose.components.Progress
 
 
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
index 0edfe02b366c2904211afdb7fc906cdafb780bde..f868bb3abbf79a0f37aa2db9fecdc2fc26668ba8 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.launchIn
 import net.novagamestudios.common_utils.compose.components.Progress
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
 import kotlin.coroutines.suspendCoroutine
 
 typealias RichDataCollector<T> = FlowCollector<RichData<T>>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 11fda3d5f1728a3ff80936bec958f20dec3c7f2d..b1031308fbf23f8b2bdcc36a8f263d60383cb67d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ vico = "2.0.0-alpha.8"
 voyager = "1.0.0"
 coil = "2.6.0"
 acra = "5.11.3"
-commonutils = "2b6273ca33"
+commonutils = "faae744c0d"
 junit4 = "4.13.2"
 
 [plugins]