diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 616d5d3c2..b30c56b1d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,7 @@
             tools:replace="screenOrientation" />
 
         <service
-            android:name=".PlaybackService"
+            android:name=".service.playback.PlaybackService"
             android:foregroundServiceType="mediaPlayback"
             android:stopWithTask="true"
             android:exported="true">
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
index dcff97b6d..d2a447fdf 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
+import com.vitorpamplona.amethyst.service.playback.VideoCache
 
 class Amethyst : Application() {
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
index cc9189554..c17c11fb4 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
@@ -87,6 +87,7 @@ object LocalPreferences {
     private const val comma = ","
 
     private var _currentAccount: String? = null
+    private var _savedAccounts: List<String>? = null
 
     fun currentAccount(): String? {
         if (_currentAccount == null) {
@@ -105,8 +106,6 @@ object LocalPreferences {
         }
     }
 
-    private var _savedAccounts: List<String>? = null
-
     private fun savedAccounts(): List<String> {
         if (_savedAccounts == null) {
             _savedAccounts = encryptedPreferences()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/MultiPlayerPlaybackManager.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
similarity index 98%
rename from app/src/main/java/com/vitorpamplona/amethyst/MultiPlayerPlaybackManager.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
index a72334cae..f57c577bc 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/MultiPlayerPlaybackManager.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst
+package com.vitorpamplona.amethyst.service.playback
 
 import android.app.PendingIntent
 import android.content.Context
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/PlaybackClientController.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt
similarity index 96%
rename from app/src/main/java/com/vitorpamplona/amethyst/PlaybackClientController.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt
index 7e497cbca..eaafe05ae 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/PlaybackClientController.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst
+package com.vitorpamplona.amethyst.service.playback
 
 import android.content.ComponentName
 import android.content.Context
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/PlaybackService.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt
similarity index 95%
rename from app/src/main/java/com/vitorpamplona/amethyst/PlaybackService.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt
index 9e11c4843..c76cbe84b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/PlaybackService.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst
+package com.vitorpamplona.amethyst.service.playback
 
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
@@ -8,6 +8,7 @@ import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.HttpClient
 
 @UnstableApi // Extend MediaSessionService
@@ -23,7 +24,12 @@ class PlaybackService : MediaSessionService() {
     }
 
     fun newProgressiveDataSource(): MediaSource.Factory {
-        return ProgressiveMediaSource.Factory(VideoCache.get(Amethyst.instance, HttpClient.getHttpClient()))
+        return ProgressiveMediaSource.Factory(
+            VideoCache.get(
+                Amethyst.instance,
+                HttpClient.getHttpClient()
+            )
+        )
     }
 
     fun lazyHlsDS(): MultiPlayerPlaybackManager {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt
similarity index 97%
rename from app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt
index e4ad817e1..ea3cd2312 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst
+package com.vitorpamplona.amethyst.service.playback
 
 import android.content.Context
 import androidx.media3.common.util.UnstableApi
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/VideoViewedPositionCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt
similarity index 84%
rename from app/src/main/java/com/vitorpamplona/amethyst/VideoViewedPositionCache.kt
rename to app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt
index 29dfa193a..569e131fe 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/VideoViewedPositionCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst
+package com.vitorpamplona.amethyst.service.playback
 
 import android.util.LruCache
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
index 9f61e9278..03d2b720e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
@@ -63,9 +63,9 @@ import androidx.media3.session.MediaController
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import com.linc.audiowaveform.infiniteLinearGradient
-import com.vitorpamplona.amethyst.PlaybackClientController
 import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
+import com.vitorpamplona.amethyst.service.playback.PlaybackClientController
 import com.vitorpamplona.amethyst.ui.note.LyricsIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsOffIcon
 import com.vitorpamplona.amethyst.ui.note.MuteIcon