diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index da4c5c4..8a37144 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,7 +39,7 @@ android {
   compileSdkVersion(29)
 
   defaultConfig {
-    applicationId = "com.github.apognu.otter"
+    applicationId = "org.funkwhale.ffa"
 
     minSdkVersion(23)
     targetSdkVersion(29)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f0270e1..df59f42 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1 +1 @@
--keep class com.github.apognu.otter.** { *; }
+-keep class org.funkwhale.ffa.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56af713..c291d91 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.github.apognu.otter">
+  package="org.funkwhale.ffa">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -9,7 +9,7 @@
   <permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
 
   <application
-    android:name="com.github.apognu.otter.Otter"
+    android:name="org.funkwhale.ffa.FFA"
     android:allowBackup="false"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
diff --git a/app/src/main/java/com/github/apognu/otter/Otter.kt b/app/src/main/java/org/funkwhale/ffa/FFA.kt
similarity index 88%
rename from app/src/main/java/com/github/apognu/otter/Otter.kt
rename to app/src/main/java/org/funkwhale/ffa/FFA.kt
index bdbb0ab..bb898fb 100644
--- a/app/src/main/java/com/github/apognu/otter/Otter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/FFA.kt
@@ -1,10 +1,7 @@
-package com.github.apognu.otter
+package org.funkwhale.ffa
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
-import com.github.apognu.otter.playback.MediaSession
-import com.github.apognu.otter.playback.QueueManager
-import com.github.apognu.otter.utils.*
 import com.google.android.exoplayer2.database.ExoDatabaseProvider
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex
 import com.google.android.exoplayer2.offline.DefaultDownloaderFactory
@@ -16,14 +13,17 @@ import com.google.android.exoplayer2.upstream.cache.SimpleCache
 import com.preference.PowerPreference
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.ConflatedBroadcastChannel
+import org.funkwhale.ffa.playback.MediaSession
+import org.funkwhale.ffa.playback.QueueManager
+import org.funkwhale.ffa.utils.*
 import java.text.SimpleDateFormat
 import java.util.*
 
-class Otter : Application() {
+class FFA : Application() {
   companion object {
-    private var instance: Otter = Otter()
+    private var instance: FFA = FFA()
 
-    fun get(): Otter = instance
+    fun get(): FFA = instance
   }
 
   var defaultExceptionHandler: Thread.UncaughtExceptionHandler? = null
@@ -57,7 +57,7 @@ class Otter : Application() {
 
   val exoDownloadManager: DownloadManager by lazy {
     DownloaderConstructorHelper(exoDownloadCache, QueueManager.factory(this)).run {
-      DownloadManager(this@Otter, DefaultDownloadIndex(exoDatabase), DefaultDownloaderFactory(this))
+      DownloadManager(this@FFA, DefaultDownloadIndex(exoDatabase), DefaultDownloaderFactory(this))
     }
   }
 
@@ -104,11 +104,11 @@ class Otter : Application() {
 
           builder.appendln(e.toString())
 
-          Cache.set(this@Otter, "crashdump", builder.toString().toByteArray())
+          Cache.set(this@FFA, "crashdump", builder.toString().toByteArray())
         }
       }
 
       defaultExceptionHandler?.uncaughtException(t, e)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/DownloadsActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/DownloadsActivity.kt
similarity index 85%
rename from app/src/main/java/com/github/apognu/otter/activities/DownloadsActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/DownloadsActivity.kt
index dd1cec4..48f856f 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/DownloadsActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/DownloadsActivity.kt
@@ -1,23 +1,23 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.DownloadsAdapter
-import com.github.apognu.otter.utils.Event
-import com.github.apognu.otter.utils.EventBus
-import com.github.apognu.otter.utils.getMetadata
 import com.google.android.exoplayer2.offline.Download
-import kotlinx.android.synthetic.main.activity_downloads.*
+import kotlinx.android.synthetic.main.activity_downloads.downloads
 import kotlinx.coroutines.Dispatchers.Default
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.DownloadsAdapter
+import org.funkwhale.ffa.utils.Event
+import org.funkwhale.ffa.utils.EventBus
+import org.funkwhale.ffa.utils.getMetadata
 
 class DownloadsActivity : AppCompatActivity() {
   lateinit var adapter: DownloadsAdapter
@@ -60,7 +60,7 @@ class DownloadsActivity : AppCompatActivity() {
 
   private fun refresh() {
     lifecycleScope.launch(Main) {
-      val cursor = Otter.get().exoDownloadManager.downloadIndex.getDownloads()
+      val cursor = FFA.get().exoDownloadManager.downloadIndex.getDownloads()
 
       adapter.downloads.clear()
 
@@ -95,7 +95,7 @@ class DownloadsActivity : AppCompatActivity() {
   }
 
   private suspend fun refreshProgress() {
-    val cursor = Otter.get().exoDownloadManager.downloadIndex.getDownloads()
+    val cursor = FFA.get().exoDownloadManager.downloadIndex.getDownloads()
 
     while (cursor.moveToNext()) {
       val download = cursor.download
@@ -122,4 +122,4 @@ class DownloadsActivity : AppCompatActivity() {
       adapter.notifyDataSetChanged()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/LicencesActivity.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/LicencesActivity.kt
index bc3a2f2..c08ff57 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/LicencesActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/LicencesActivity.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.content.Intent
 import android.net.Uri
@@ -9,7 +9,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
+import org.funkwhale.ffa.R
 import kotlinx.android.synthetic.main.activity_licences.*
 import kotlinx.android.synthetic.main.row_licence.view.*
 
@@ -104,4 +104,4 @@ class LicencesActivity : AppCompatActivity() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/LoginActivity.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/LoginActivity.kt
index a9d37f0..1de19cb 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/LoginActivity.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.content.Intent
 import android.content.res.Configuration
@@ -9,10 +9,10 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.doOnLayout
 import androidx.lifecycle.lifecycleScope
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.LoginDialog
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Userinfo
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.LoginDialog
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Userinfo
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
@@ -203,4 +203,4 @@ class LoginActivity : AppCompatActivity() {
       container.requestLayout()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/MainActivity.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/MainActivity.kt
index d119234..25f86a0 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -21,17 +21,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.*
-import com.github.apognu.otter.playback.MediaControlsManager
-import com.github.apognu.otter.playback.PinService
-import com.github.apognu.otter.playback.PlayerService
-import com.github.apognu.otter.repositories.FavoritedRepository
-import com.github.apognu.otter.repositories.FavoritesRepository
-import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.*
-import com.github.apognu.otter.views.DisableableFrameLayout
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitStringResponse
 import com.google.android.exoplayer2.Player
@@ -48,6 +37,17 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.*
+import org.funkwhale.ffa.playback.MediaControlsManager
+import org.funkwhale.ffa.playback.PinService
+import org.funkwhale.ffa.playback.PlayerService
+import org.funkwhale.ffa.repositories.FavoritedRepository
+import org.funkwhale.ffa.repositories.FavoritesRepository
+import org.funkwhale.ffa.repositories.Repository
+import org.funkwhale.ffa.utils.*
+import org.funkwhale.ffa.views.DisableableFrameLayout
 
 class MainActivity : AppCompatActivity() {
   enum class ResultCode(val code: Int) {
@@ -253,7 +253,7 @@ class MainActivity : AppCompatActivity() {
 
     if (resultCode == ResultCode.LOGOUT.code) {
       Intent(this, LoginActivity::class.java).apply {
-        Otter.get().deleteAllData()
+        FFA.get().deleteAllData()
 
         flags =
           Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
@@ -292,7 +292,7 @@ class MainActivity : AppCompatActivity() {
       EventBus.get().collect { message ->
         when (message) {
           is Event.LogOut -> {
-            Otter.get().deleteAllData()
+            FFA.get().deleteAllData()
 
             startActivity(Intent(this@MainActivity, LoginActivity::class.java).apply {
               flags = Intent.FLAG_ACTIVITY_NO_HISTORY
diff --git a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/SearchActivity.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/SearchActivity.kt
index c93d7c8..202e9b4 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/SearchActivity.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.os.Bundle
 import android.view.View
@@ -6,13 +6,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.SearchAdapter
-import com.github.apognu.otter.fragments.AddToPlaylistDialog
-import com.github.apognu.otter.fragments.AlbumsFragment
-import com.github.apognu.otter.fragments.ArtistsFragment
-import com.github.apognu.otter.repositories.*
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.SearchAdapter
+import org.funkwhale.ffa.fragments.AddToPlaylistDialog
+import org.funkwhale.ffa.fragments.AlbumsFragment
+import org.funkwhale.ffa.fragments.ArtistsFragment
+import org.funkwhale.ffa.repositories.*
+import org.funkwhale.ffa.utils.*
 import com.google.android.exoplayer2.offline.Download
 import kotlinx.android.synthetic.main.activity_search.*
 import kotlinx.coroutines.Dispatchers
@@ -168,4 +168,4 @@ class SearchActivity : AppCompatActivity() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/SettingsActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/SettingsActivity.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/activities/SettingsActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/SettingsActivity.kt
index f6fc33b..1b992da 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SettingsActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.content.*
 import android.os.Bundle
@@ -10,12 +10,12 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SeekBarPreference
-import com.github.apognu.otter.BuildConfig
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.Cache
-import com.github.apognu.otter.utils.Command
-import com.github.apognu.otter.utils.CommandBus
+import org.funkwhale.ffa.BuildConfig
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.Cache
+import org.funkwhale.ffa.utils.Command
+import org.funkwhale.ffa.utils.CommandBus
 
 class SettingsActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -82,7 +82,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
             .setPositiveButton(android.R.string.yes) { _, _ ->
               CommandBus.send(Command.ClearQueue)
 
-              Otter.get().deleteAllData()
+              FFA.get().deleteAllData()
 
               activity?.setResult(MainActivity.ResultCode.LOGOUT.code)
               activity?.finish()
@@ -154,4 +154,4 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/activities/SplashActivity.kt b/app/src/main/java/org/funkwhale/ffa/activities/SplashActivity.kt
similarity index 78%
rename from app/src/main/java/com/github/apognu/otter/activities/SplashActivity.kt
rename to app/src/main/java/org/funkwhale/ffa/activities/SplashActivity.kt
index 1716cf0..cb85974 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SplashActivity.kt
+++ b/app/src/main/java/org/funkwhale/ffa/activities/SplashActivity.kt
@@ -1,12 +1,12 @@
-package com.github.apognu.otter.activities
+package org.funkwhale.ffa.activities
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Settings
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Settings
 
 class SplashActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -21,7 +21,7 @@ class SplashActivity : AppCompatActivity() {
         }
 
         false -> Intent(this@SplashActivity, LoginActivity::class.java).apply {
-          Otter.get().deleteAllData()
+          FFA.get().deleteAllData()
 
           flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
 
@@ -30,4 +30,4 @@ class SplashActivity : AppCompatActivity() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/AlbumsAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/AlbumsAdapter.kt
similarity index 87%
rename from app/src/main/java/com/github/apognu/otter/adapters/AlbumsAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/AlbumsAdapter.kt
index 0cfd954..4408808 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/AlbumsAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/AlbumsAdapter.kt
@@ -1,15 +1,15 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.Album
-import com.github.apognu.otter.utils.maybeLoad
-import com.github.apognu.otter.utils.maybeNormalizeUrl
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.Album
+import org.funkwhale.ffa.utils.maybeLoad
+import org.funkwhale.ffa.utils.maybeNormalizeUrl
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_album.view.*
@@ -63,4 +63,4 @@ class AlbumsAdapter(val context: Context?, private val listener: OnAlbumClickLis
       listener.onClick(view, data[layoutPosition])
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/AlbumsGridAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/AlbumsGridAdapter.kt
similarity index 85%
rename from app/src/main/java/com/github/apognu/otter/adapters/AlbumsGridAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/AlbumsGridAdapter.kt
index 7a17a55..b3a0cd0 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/AlbumsGridAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/AlbumsGridAdapter.kt
@@ -1,15 +1,15 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.Album
-import com.github.apognu.otter.utils.maybeLoad
-import com.github.apognu.otter.utils.maybeNormalizeUrl
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.Album
+import org.funkwhale.ffa.utils.maybeLoad
+import org.funkwhale.ffa.utils.maybeNormalizeUrl
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_album_grid.view.*
@@ -52,4 +52,4 @@ class AlbumsGridAdapter(val context: Context?, private val listener: OnAlbumClic
       listener.onClick(view, data[layoutPosition])
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/ArtistsAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/ArtistsAdapter.kt
similarity index 89%
rename from app/src/main/java/com/github/apognu/otter/adapters/ArtistsAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/ArtistsAdapter.kt
index 52c5a84..193c7fe 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/ArtistsAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/ArtistsAdapter.kt
@@ -1,15 +1,15 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.Artist
-import com.github.apognu.otter.utils.maybeLoad
-import com.github.apognu.otter.utils.maybeNormalizeUrl
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.Artist
+import org.funkwhale.ffa.utils.maybeLoad
+import org.funkwhale.ffa.utils.maybeNormalizeUrl
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_artist.view.*
@@ -80,4 +80,4 @@ class ArtistsAdapter(val context: Context?, private val listener: OnArtistClickL
       listener.onClick(view, active[layoutPosition])
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/BrowseTabsAdapter.kt
similarity index 90%
rename from app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/BrowseTabsAdapter.kt
index 3f5fe75..b47baa6 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/BrowseTabsAdapter.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.*
 
 class BrowseTabsAdapter(val context: Fragment, manager: FragmentManager) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
   var tabs = mutableListOf<Fragment>()
@@ -40,4 +40,4 @@ class BrowseTabsAdapter(val context: Fragment, manager: FragmentManager) : Fragm
       else -> ""
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/DownloadsAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/DownloadsAdapter.kt
similarity index 95%
rename from app/src/main/java/com/github/apognu/otter/adapters/DownloadsAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/DownloadsAdapter.kt
index 4e59c23..4c7a3b4 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/DownloadsAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/DownloadsAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.graphics.drawable.Icon
@@ -6,9 +6,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.playback.PinService
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.playback.PinService
+import org.funkwhale.ffa.utils.*
 import com.google.android.exoplayer2.offline.Download
 import com.google.android.exoplayer2.offline.DownloadService
 import kotlinx.android.synthetic.main.row_download.view.*
@@ -102,4 +102,4 @@ class DownloadsAdapter(private val context: Context, private val listener: OnDow
     val toggle = view.toggle
     val delete = view.delete
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/FavoritesAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/FavoritesAdapter.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/adapters/FavoritesAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/FavoritesAdapter.kt
index c028d63..132ae79 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/FavoritesAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/FavoritesAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -10,9 +10,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_track.view.*
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/PlaylistTracksAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/adapters/PlaylistTracksAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt
index 2f57145..62581fd 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/PlaylistTracksAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/PlaylistTracksAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -9,9 +9,9 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_track.view.*
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/PlaylistsAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/PlaylistsAdapter.kt
similarity index 92%
rename from app/src/main/java/com/github/apognu/otter/adapters/PlaylistsAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/PlaylistsAdapter.kt
index d2a991b..bcaf901 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/PlaylistsAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/PlaylistsAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,10 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.Playlist
-import com.github.apognu.otter.utils.toDurationString
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.Playlist
+import org.funkwhale.ffa.utils.toDurationString
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_playlist.view.*
@@ -83,4 +83,4 @@ class PlaylistsAdapter(val context: Context?, private val listener: OnPlaylistCl
       listener.onClick(view, data[layoutPosition])
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/RadiosAdapter.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/RadiosAdapter.kt
index 607c83d..62cf352 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/RadiosAdapter.kt
@@ -1,17 +1,17 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Event
-import com.github.apognu.otter.utils.EventBus
-import com.github.apognu.otter.utils.Radio
-import com.github.apognu.otter.views.LoadingImageView
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Event
+import org.funkwhale.ffa.utils.EventBus
+import org.funkwhale.ffa.utils.Radio
+import org.funkwhale.ffa.views.LoadingImageView
 import com.preference.PowerPreference
 import kotlinx.android.synthetic.main.row_radio.view.*
 import kotlinx.android.synthetic.main.row_radio_header.view.*
@@ -160,4 +160,4 @@ class RadiosAdapter(val context: Context?, val scope: CoroutineScope, private va
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/SearchAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/SearchAdapter.kt
similarity index 98%
rename from app/src/main/java/com/github/apognu/otter/adapters/SearchAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/SearchAdapter.kt
index 5ead7a2..8d93c91 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/SearchAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/SearchAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -12,8 +12,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_track.view.*
diff --git a/app/src/main/java/com/github/apognu/otter/adapters/TracksAdapter.kt b/app/src/main/java/org/funkwhale/ffa/adapters/TracksAdapter.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/adapters/TracksAdapter.kt
rename to app/src/main/java/org/funkwhale/ffa/adapters/TracksAdapter.kt
index 6e2e041..3377b8c 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/TracksAdapter.kt
+++ b/app/src/main/java/org/funkwhale/ffa/adapters/TracksAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.adapters
+package org.funkwhale.ffa.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -9,9 +9,9 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.OtterAdapter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.OtterAdapter
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.row_track.view.*
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/AddToPlaylistDialog.kt b/app/src/main/java/org/funkwhale/ffa/fragments/AddToPlaylistDialog.kt
similarity index 92%
rename from app/src/main/java/com/github/apognu/otter/fragments/AddToPlaylistDialog.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/AddToPlaylistDialog.kt
index 8f90041..f8541f2 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/AddToPlaylistDialog.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/AddToPlaylistDialog.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.app.Activity
 import android.app.AlertDialog
@@ -6,10 +6,10 @@ import android.view.View
 import android.widget.Toast
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.PlaylistsAdapter
-import com.github.apognu.otter.repositories.ManagementPlaylistsRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.PlaylistsAdapter
+import org.funkwhale.ffa.repositories.ManagementPlaylistsRepository
+import org.funkwhale.ffa.utils.*
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.dialog_add_to_playlist.*
 import kotlinx.coroutines.CoroutineScope
@@ -102,4 +102,4 @@ object AddToPlaylistDialog {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/AlbumsFragment.kt
similarity index 92%
rename from app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/AlbumsFragment.kt
index 11ace9e..fa9b302 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/AlbumsFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.content.Context
 import android.os.Bundle
@@ -13,13 +13,13 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.transition.Fade
 import androidx.transition.Slide
-import com.github.apognu.otter.R
-import com.github.apognu.otter.activities.MainActivity
-import com.github.apognu.otter.adapters.AlbumsAdapter
-import com.github.apognu.otter.repositories.AlbumsRepository
-import com.github.apognu.otter.repositories.ArtistTracksRepository
-import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.activities.MainActivity
+import org.funkwhale.ffa.adapters.AlbumsAdapter
+import org.funkwhale.ffa.repositories.AlbumsRepository
+import org.funkwhale.ffa.repositories.ArtistTracksRepository
+import org.funkwhale.ffa.repositories.Repository
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.fragment_albums.*
@@ -172,4 +172,4 @@ class AlbumsFragment : OtterFragment<Album, AlbumsAdapter>() {
       openTracks(context, album, fragment = this@AlbumsFragment)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsGridFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/AlbumsGridFragment.kt
similarity index 83%
rename from app/src/main/java/com/github/apognu/otter/fragments/AlbumsGridFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/AlbumsGridFragment.kt
index f0c0d8e..bb541e7 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsGridFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/AlbumsGridFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.View
@@ -7,12 +7,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
 import androidx.transition.Slide
-import com.github.apognu.otter.R
-import com.github.apognu.otter.activities.MainActivity
-import com.github.apognu.otter.adapters.AlbumsGridAdapter
-import com.github.apognu.otter.repositories.AlbumsRepository
-import com.github.apognu.otter.utils.Album
-import com.github.apognu.otter.utils.AppContext
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.activities.MainActivity
+import org.funkwhale.ffa.adapters.AlbumsGridAdapter
+import org.funkwhale.ffa.repositories.AlbumsRepository
+import org.funkwhale.ffa.utils.Album
+import org.funkwhale.ffa.utils.AppContext
 import kotlinx.android.synthetic.main.fragment_albums_grid.*
 
 class AlbumsGridFragment : OtterFragment<Album, AlbumsGridAdapter>() {
@@ -55,4 +55,4 @@ class AlbumsGridFragment : OtterFragment<Album, AlbumsGridAdapter>() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/ArtistsFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/ArtistsFragment.kt
similarity index 84%
rename from app/src/main/java/com/github/apognu/otter/fragments/ArtistsFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/ArtistsFragment.kt
index 2372fc4..36420aa 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/ArtistsFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/ArtistsFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.content.Context
 import android.os.Bundle
@@ -9,13 +9,13 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
 import androidx.transition.Slide
-import com.github.apognu.otter.R
-import com.github.apognu.otter.activities.MainActivity
-import com.github.apognu.otter.adapters.ArtistsAdapter
-import com.github.apognu.otter.repositories.ArtistsRepository
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Artist
-import com.github.apognu.otter.utils.onViewPager
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.activities.MainActivity
+import org.funkwhale.ffa.adapters.ArtistsAdapter
+import org.funkwhale.ffa.repositories.ArtistsRepository
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Artist
+import org.funkwhale.ffa.utils.onViewPager
 import kotlinx.android.synthetic.main.fragment_artists.*
 
 class ArtistsFragment : OtterFragment<Artist, ArtistsAdapter>() {
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/BrowseFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/BrowseFragment.kt
similarity index 86%
rename from app/src/main/java/com/github/apognu/otter/fragments/BrowseFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/BrowseFragment.kt
index ef01296..0ce4b8f 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/BrowseFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/BrowseFragment.kt
@@ -1,12 +1,12 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.BrowseTabsAdapter
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.BrowseTabsAdapter
 import kotlinx.android.synthetic.main.fragment_browse.view.*
 
 class BrowseFragment : Fragment() {
@@ -31,4 +31,4 @@ class BrowseFragment : Fragment() {
   fun selectTabAt(position: Int) {
     view?.tabs?.getTabAt(position)?.select()
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/FavoritesFragment.kt
similarity index 91%
rename from app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/FavoritesFragment.kt
index c385757..d7200a4 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/FavoritesFragment.kt
@@ -1,13 +1,13 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.FavoritesAdapter
-import com.github.apognu.otter.repositories.FavoritesRepository
-import com.github.apognu.otter.repositories.TracksRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.FavoritesAdapter
+import org.funkwhale.ffa.repositories.FavoritesRepository
+import org.funkwhale.ffa.repositories.TracksRepository
+import org.funkwhale.ffa.utils.*
 import com.google.android.exoplayer2.offline.Download
 import kotlinx.android.synthetic.main.fragment_favorites.*
 import kotlinx.coroutines.Dispatchers.IO
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/LandscapeQueueFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/fragments/LandscapeQueueFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
index b375ff6..e234194 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/LandscapeQueueFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.TracksAdapter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.TracksAdapter
+import org.funkwhale.ffa.utils.*
 import kotlinx.android.synthetic.main.partial_queue.*
 import kotlinx.android.synthetic.main.partial_queue.view.*
 import kotlinx.coroutines.Dispatchers.Main
@@ -93,4 +93,4 @@ class LandscapeQueueFragment : Fragment() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/LoginDialog.kt b/app/src/main/java/org/funkwhale/ffa/fragments/LoginDialog.kt
similarity index 87%
rename from app/src/main/java/com/github/apognu/otter/fragments/LoginDialog.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/LoginDialog.kt
index 4fd4682..39a5e1d 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/LoginDialog.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/LoginDialog.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import com.github.apognu.otter.R
+import org.funkwhale.ffa.R
 
 class LoginDialog : DialogFragment() {
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -20,4 +20,4 @@ class LoginDialog : DialogFragment() {
     dialog?.setCanceledOnTouchOutside(false)
     dialog?.setCancelable(false)
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/OtterFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/OtterFragment.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/fragments/OtterFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/OtterFragment.kt
index 8385b1b..d65b805 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/OtterFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/OtterFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,9 +9,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
-import com.github.apognu.otter.repositories.HttpUpstream
-import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.repositories.HttpUpstream
+import org.funkwhale.ffa.repositories.Repository
+import org.funkwhale.ffa.utils.*
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.fragment_artists.*
 import kotlinx.coroutines.Dispatchers.IO
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
index 1601fee..7bd34b4 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.Gravity
@@ -7,12 +7,12 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.PlaylistTracksAdapter
-import com.github.apognu.otter.repositories.FavoritesRepository
-import com.github.apognu.otter.repositories.ManagementPlaylistsRepository
-import com.github.apognu.otter.repositories.PlaylistTracksRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.PlaylistTracksAdapter
+import org.funkwhale.ffa.repositories.FavoritesRepository
+import org.funkwhale.ffa.repositories.ManagementPlaylistsRepository
+import org.funkwhale.ffa.repositories.PlaylistTracksRepository
+import org.funkwhale.ffa.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
 import kotlinx.android.synthetic.main.fragment_tracks.*
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistsFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/PlaylistsFragment.kt
similarity index 82%
rename from app/src/main/java/com/github/apognu/otter/fragments/PlaylistsFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/PlaylistsFragment.kt
index b077350..dd32d85 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistsFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/PlaylistsFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.View
@@ -6,12 +6,12 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
 import androidx.transition.Slide
-import com.github.apognu.otter.R
-import com.github.apognu.otter.activities.MainActivity
-import com.github.apognu.otter.adapters.PlaylistsAdapter
-import com.github.apognu.otter.repositories.PlaylistsRepository
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Playlist
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.activities.MainActivity
+import org.funkwhale.ffa.adapters.PlaylistsAdapter
+import org.funkwhale.ffa.repositories.PlaylistsRepository
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Playlist
 import kotlinx.android.synthetic.main.fragment_playlists.*
 
 class PlaylistsFragment : OtterFragment<Playlist, PlaylistsAdapter>() {
@@ -53,4 +53,4 @@ class PlaylistsFragment : OtterFragment<Playlist, PlaylistsAdapter>() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/QueueFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/QueueFragment.kt
similarity index 94%
rename from app/src/main/java/com/github/apognu/otter/fragments/QueueFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/QueueFragment.kt
index 585ffb8..87f635b 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/QueueFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/QueueFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.app.Dialog
 import android.os.Bundle
@@ -8,10 +8,10 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.TracksAdapter
-import com.github.apognu.otter.repositories.FavoritesRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.TracksAdapter
+import org.funkwhale.ffa.repositories.FavoritesRepository
+import org.funkwhale.ffa.utils.*
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.fragment_queue.*
@@ -126,4 +126,4 @@ class QueueFragment : BottomSheetDialogFragment() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/RadiosFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/RadiosFragment.kt
similarity index 86%
rename from app/src/main/java/com/github/apognu/otter/fragments/RadiosFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/RadiosFragment.kt
index 9388835..81d7a9f 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/RadiosFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/RadiosFragment.kt
@@ -1,13 +1,13 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import androidx.core.view.forEach
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.RadiosAdapter
-import com.github.apognu.otter.repositories.RadiosRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.RadiosAdapter
+import org.funkwhale.ffa.repositories.RadiosRepository
+import org.funkwhale.ffa.utils.*
 import kotlinx.android.synthetic.main.fragment_radios.*
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.flow.collect
@@ -50,4 +50,4 @@ class RadiosFragment : OtterFragment<Radio, RadiosAdapter>() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/TrackInfoDetailsFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/TrackInfoDetailsFragment.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/fragments/TrackInfoDetailsFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/TrackInfoDetailsFragment.kt
index 927a7aa..c48f10b 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/TrackInfoDetailsFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/TrackInfoDetailsFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.net.Uri
 import android.os.Bundle
@@ -10,10 +10,10 @@ import android.view.ViewGroup.LayoutParams
 import android.widget.TextView
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.Track
-import com.github.apognu.otter.utils.mustNormalizeUrl
-import com.github.apognu.otter.utils.toDurationString
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.Track
+import org.funkwhale.ffa.utils.mustNormalizeUrl
+import org.funkwhale.ffa.utils.toDurationString
 import kotlinx.android.synthetic.main.fragment_track_info_details.*
 
 class TrackInfoDetailsFragment : DialogFragment() {
@@ -82,4 +82,4 @@ class TrackInfoDetailsFragment : DialogFragment() {
       infos.addView(valueTextView)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt b/app/src/main/java/org/funkwhale/ffa/fragments/TracksFragment.kt
similarity index 94%
rename from app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
rename to app/src/main/java/org/funkwhale/ffa/fragments/TracksFragment.kt
index 4d9ef7c..96b45e7 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
+++ b/app/src/main/java/org/funkwhale/ffa/fragments/TracksFragment.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.fragments
+package org.funkwhale.ffa.fragments
 
 import android.os.Bundle
 import android.view.Gravity
@@ -7,12 +7,12 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.github.apognu.otter.R
-import com.github.apognu.otter.adapters.TracksAdapter
-import com.github.apognu.otter.repositories.FavoritedRepository
-import com.github.apognu.otter.repositories.FavoritesRepository
-import com.github.apognu.otter.repositories.TracksRepository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.adapters.TracksAdapter
+import org.funkwhale.ffa.repositories.FavoritedRepository
+import org.funkwhale.ffa.repositories.FavoritesRepository
+import org.funkwhale.ffa.repositories.TracksRepository
+import org.funkwhale.ffa.utils.*
 import com.google.android.exoplayer2.offline.Download
 import com.preference.PowerPreference
 import com.squareup.picasso.Picasso
diff --git a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt b/app/src/main/java/org/funkwhale/ffa/playback/MediaControlsManager.kt
similarity index 90%
rename from app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/MediaControlsManager.kt
index 5ff6d05..57e6892 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/MediaControlsManager.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.app.Notification
 import android.app.PendingIntent
@@ -10,12 +10,12 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.media.app.NotificationCompat.MediaStyle
 import androidx.media.session.MediaButtonReceiver
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.activities.MainActivity
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Track
-import com.github.apognu.otter.utils.maybeNormalizeUrl
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.activities.MainActivity
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Track
+import org.funkwhale.ffa.utils.maybeNormalizeUrl
 import com.squareup.picasso.Picasso
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.Default
@@ -99,7 +99,7 @@ class MediaControlsManager(val context: Service, private val scope: CoroutineSco
           }
         }
 
-        Otter.get().mediaSession.connector.invalidateMediaSessionMetadata()
+        FFA.get().mediaSession.connector.invalidateMediaSessionMetadata()
       }
     }
   }
diff --git a/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt b/app/src/main/java/org/funkwhale/ffa/playback/MediaSession.kt
similarity index 95%
rename from app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/MediaSession.kt
index 7c811ae..6618893 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/MediaSession.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.content.Context
 import android.content.Intent
@@ -6,8 +6,8 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
-import com.github.apognu.otter.utils.Command
-import com.github.apognu.otter.utils.CommandBus
+import org.funkwhale.ffa.utils.Command
+import org.funkwhale.ffa.utils.CommandBus
 import com.google.android.exoplayer2.ControlDispatcher
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
diff --git a/app/src/main/java/com/github/apognu/otter/playback/PinService.kt b/app/src/main/java/org/funkwhale/ffa/playback/PinService.kt
similarity index 68%
rename from app/src/main/java/com/github/apognu/otter/playback/PinService.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/PinService.kt
index 6861496..3d0459c 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/PinService.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/PinService.kt
@@ -1,12 +1,9 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.app.Notification
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.*
 import com.google.android.exoplayer2.offline.Download
 import com.google.android.exoplayer2.offline.DownloadManager
 import com.google.android.exoplayer2.offline.DownloadRequest
@@ -19,7 +16,18 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import java.util.*
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.DownloadInfo
+import org.funkwhale.ffa.utils.Event
+import org.funkwhale.ffa.utils.EventBus
+import org.funkwhale.ffa.utils.Request
+import org.funkwhale.ffa.utils.RequestBus
+import org.funkwhale.ffa.utils.Response
+import org.funkwhale.ffa.utils.Track
+import org.funkwhale.ffa.utils.mustNormalizeUrl
+import java.util.Collections
 
 class PinService : DownloadService(AppContext.NOTIFICATION_DOWNLOADS) {
   private val scope: CoroutineScope = CoroutineScope(Job() + Main)
@@ -38,7 +46,14 @@ class PinService : DownloadService(AppContext.NOTIFICATION_DOWNLOADS) {
           )
         ).toByteArray()
 
-        DownloadRequest(url, DownloadRequest.TYPE_PROGRESSIVE, Uri.parse(url), Collections.emptyList(), null, data).also {
+        DownloadRequest(
+          url,
+          DownloadRequest.TYPE_PROGRESSIVE,
+          Uri.parse(url),
+          Collections.emptyList(),
+          null,
+          data
+        ).also {
           sendAddDownload(context, PinService::class.java, it, false)
         }
       }
@@ -59,16 +74,20 @@ class PinService : DownloadService(AppContext.NOTIFICATION_DOWNLOADS) {
     return super.onStartCommand(intent, flags, startId)
   }
 
-  override fun getDownloadManager() = Otter.get().exoDownloadManager.apply {
+  override fun getDownloadManager() = FFA.get().exoDownloadManager.apply {
     addListener(DownloadListener())
   }
 
   override fun getScheduler(): Scheduler? = null
 
   override fun getForegroundNotification(downloads: MutableList<Download>): Notification {
-    val description = resources.getQuantityString(R.plurals.downloads_description, downloads.size, downloads.size)
+    val description =
+      resources.getQuantityString(R.plurals.downloads_description, downloads.size, downloads.size)
 
-    return DownloadNotificationHelper(this, AppContext.NOTIFICATION_CHANNEL_DOWNLOADS).buildProgressNotification(R.drawable.downloads, null, description, downloads)
+    return DownloadNotificationHelper(
+      this,
+      AppContext.NOTIFICATION_CHANNEL_DOWNLOADS
+    ).buildProgressNotification(R.drawable.downloads, null, description, downloads)
   }
 
   private fun getDownloads() = downloadManager.downloadIndex.getDownloads()
@@ -80,4 +99,4 @@ class PinService : DownloadService(AppContext.NOTIFICATION_DOWNLOADS) {
       EventBus.send(Event.DownloadChanged(download))
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt b/app/src/main/java/org/funkwhale/ffa/playback/PlayerService.kt
similarity index 90%
rename from app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/PlayerService.kt
index 9bd56fa..46457bd 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/PlayerService.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.annotation.SuppressLint
 import android.app.Service
@@ -15,9 +15,6 @@ import android.support.v4.media.MediaMetadataCompat
 import android.view.KeyEvent
 import androidx.core.app.NotificationManagerCompat
 import androidx.media.session.MediaButtonReceiver
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.*
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlaybackException
 import com.google.android.exoplayer2.Player
@@ -29,6 +26,9 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.flow.collect
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.*
 
 class PlayerService : Service() {
   companion object {
@@ -62,10 +62,13 @@ class PlayerService : Service() {
         intent.extras?.getParcelable<KeyEvent>(Intent.EXTRA_KEY_EVENT)?.let { key ->
           when (key.keyCode) {
             KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
-              if (hasAudioFocus(true)) MediaButtonReceiver.handleIntent(Otter.get().mediaSession.session, intent)
+              if (hasAudioFocus(true)) MediaButtonReceiver.handleIntent(
+                FFA.get().mediaSession.session,
+                intent
+              )
               Unit
             }
-            else -> MediaButtonReceiver.handleIntent(Otter.get().mediaSession.session, intent)
+            else -> MediaButtonReceiver.handleIntent(FFA.get().mediaSession.session, intent)
           }
         }
       }
@@ -105,7 +108,7 @@ class PlayerService : Service() {
       }
     }
 
-    mediaControlsManager = MediaControlsManager(this, scope, Otter.get().mediaSession.session)
+    mediaControlsManager = MediaControlsManager(this, scope, FFA.get().mediaSession.session)
 
     player = SimpleExoPlayer.Builder(this).build().apply {
       playWhenReady = false
@@ -115,9 +118,9 @@ class PlayerService : Service() {
       }
     }
 
-    Otter.get().mediaSession.active = true
+    FFA.get().mediaSession.active = true
 
-    Otter.get().mediaSession.connector.apply {
+    FFA.get().mediaSession.connector.apply {
       setPlayer(player)
 
       setMediaMetadataProvider {
@@ -137,7 +140,10 @@ class PlayerService : Service() {
       }
     }
 
-    registerReceiver(headphonesUnpluggedReceiver, IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY))
+    registerReceiver(
+      headphonesUnpluggedReceiver,
+      IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
+    )
   }
 
   private fun watchEventBus() {
@@ -197,7 +203,12 @@ class PlayerService : Service() {
           is Command.SetRepeatMode -> player.repeatMode = command.mode
 
           is Command.PinTrack -> PinService.download(this@PlayerService, command.track)
-          is Command.PinTracks -> command.tracks.forEach { PinService.download(this@PlayerService, it) }
+          is Command.PinTracks -> command.tracks.forEach {
+            PinService.download(
+              this@PlayerService,
+              it
+            )
+          }
         }
       }
     }
@@ -260,7 +271,7 @@ class PlayerService : Service() {
     setPlaybackState(false)
     player.release()
 
-    Otter.get().mediaSession.active = false
+    FFA.get().mediaSession.active = false
 
     super.onDestroy()
   }
@@ -330,11 +341,17 @@ class PlayerService : Service() {
       return mediaMetadataBuilder.apply {
         putString(MediaMetadataCompat.METADATA_KEY_TITLE, track.title)
         putString(MediaMetadataCompat.METADATA_KEY_ARTIST, track.artist.name)
-        putLong(MediaMetadata.METADATA_KEY_DURATION, (track.bestUpload()?.duration?.toLong() ?: 0L) * 1000)
+        putLong(
+          MediaMetadata.METADATA_KEY_DURATION,
+          (track.bestUpload()?.duration?.toLong() ?: 0L) * 1000
+        )
 
         try {
           runBlocking(IO) {
-            this@apply.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, Picasso.get().load(coverUrl).get())
+            this@apply.putBitmap(
+              MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
+              Picasso.get().load(coverUrl).get()
+            )
           }
         } catch (e: Exception) {
         }
@@ -361,7 +378,11 @@ class PlayerService : Service() {
         {
 
           @Suppress("DEPRECATION")
-          audioManager.requestAudioFocus(audioFocusChangeListener, AudioAttributes.CONTENT_TYPE_MUSIC, AudioManager.AUDIOFOCUS_GAIN).let {
+          audioManager.requestAudioFocus(
+            audioFocusChangeListener,
+            AudioAttributes.CONTENT_TYPE_MUSIC,
+            AudioManager.AUDIOFOCUS_GAIN
+          ).let {
             allowed = when (it) {
               AudioManager.AUDIOFOCUS_REQUEST_GRANTED -> true
               else -> false
@@ -425,7 +446,10 @@ class PlayerService : Service() {
       }
     }
 
-    override fun onTracksChanged(trackGroups: TrackGroupArray, trackSelections: TrackSelectionArray) {
+    override fun onTracksChanged(
+      trackGroups: TrackGroupArray,
+      trackSelections: TrackSelectionArray
+    ) {
       super.onTracksChanged(trackGroups, trackSelections)
 
       if (queue.current != player.currentWindowIndex) {
@@ -433,7 +457,9 @@ class PlayerService : Service() {
         mediaControlsManager.updateNotification(queue.current(), player.playWhenReady)
       }
 
-      if (queue.get().isNotEmpty() && queue.current() == queue.get().last() && radioPlayer.isActive()) {
+      if (queue.get().isNotEmpty() && queue.current() == queue.get()
+          .last() && radioPlayer.isActive()
+      ) {
         scope.launch(IO) {
           if (radioPlayer.lock.tryAcquire()) {
             radioPlayer.prepareNextTrack()
@@ -495,4 +521,4 @@ class PlayerService : Service() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt b/app/src/main/java/org/funkwhale/ffa/playback/QueueManager.kt
similarity index 94%
rename from app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/QueueManager.kt
index 98385ab..a061415 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/QueueManager.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/QueueManager.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.content.Context
 import android.net.Uri
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.R
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.android.exoplayer2.source.ConcatenatingMediaSource
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
@@ -30,10 +30,10 @@ class QueueManager(val context: Context) {
         }
       }
 
-      val playbackCache = CacheDataSourceFactory(Otter.get().exoCache, http)
+      val playbackCache = CacheDataSourceFactory(FFA.get().exoCache, http)
 
       return CacheDataSourceFactory(
-        Otter.get().exoDownloadCache,
+        FFA.get().exoDownloadCache,
         playbackCache,
         FileDataSource.Factory(),
         null,
@@ -208,4 +208,4 @@ class QueueManager(val context: Context) {
 
     EventBus.send(Event.QueueChanged)
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt b/app/src/main/java/org/funkwhale/ffa/playback/RadioPlayer.kt
similarity index 95%
rename from app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt
rename to app/src/main/java/org/funkwhale/ffa/playback/RadioPlayer.kt
index 7ca7cfc..04cb6a3 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/RadioPlayer.kt
+++ b/app/src/main/java/org/funkwhale/ffa/playback/RadioPlayer.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.playback
+package org.funkwhale.ffa.playback
 
 import android.content.Context
-import com.github.apognu.otter.R
-import com.github.apognu.otter.repositories.FavoritedRepository
-import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.repositories.FavoritedRepository
+import org.funkwhale.ffa.repositories.Repository
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult
 import com.github.kittinunf.fuel.coroutines.awaitObjectResult
@@ -144,4 +144,4 @@ class RadioPlayer(val context: Context, val scope: CoroutineScope) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/AlbumsRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/AlbumsRepository.kt
similarity index 79%
rename from app/src/main/java/com/github/apognu/otter/repositories/AlbumsRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/AlbumsRepository.kt
index 4dfbb13..e1d7341 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/AlbumsRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/AlbumsRepository.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.Album
-import com.github.apognu.otter.utils.AlbumsCache
-import com.github.apognu.otter.utils.AlbumsResponse
-import com.github.apognu.otter.utils.OtterResponse
+import org.funkwhale.ffa.utils.Album
+import org.funkwhale.ffa.utils.AlbumsCache
+import org.funkwhale.ffa.utils.AlbumsResponse
+import org.funkwhale.ffa.utils.OtterResponse
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -29,4 +29,4 @@ class AlbumsRepository(override val context: Context?, artistId: Int? = null) :
 
   override fun cache(data: List<Album>) = AlbumsCache(data)
   override fun uncache(reader: BufferedReader) = gsonDeserializerOf(AlbumsCache::class.java).deserialize(reader)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/ArtistTracksRepository.kt
similarity index 74%
rename from app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/ArtistTracksRepository.kt
index 401f87d..c94ab1a 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/ArtistTracksRepository.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.OtterResponse
-import com.github.apognu.otter.utils.Track
-import com.github.apognu.otter.utils.TracksCache
-import com.github.apognu.otter.utils.TracksResponse
+import org.funkwhale.ffa.utils.OtterResponse
+import org.funkwhale.ffa.utils.Track
+import org.funkwhale.ffa.utils.TracksCache
+import org.funkwhale.ffa.utils.TracksResponse
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,4 +15,4 @@ class ArtistTracksRepository(override val context: Context?, private val artistI
 
   override fun cache(data: List<Track>) = TracksCache(data)
   override fun uncache(reader: BufferedReader) = gsonDeserializerOf(TracksCache::class.java).deserialize(reader)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/ArtistsRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/ArtistsRepository.kt
similarity index 73%
rename from app/src/main/java/com/github/apognu/otter/repositories/ArtistsRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/ArtistsRepository.kt
index b130de8..7933992 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/ArtistsRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/ArtistsRepository.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.Artist
-import com.github.apognu.otter.utils.ArtistsCache
-import com.github.apognu.otter.utils.ArtistsResponse
-import com.github.apognu.otter.utils.OtterResponse
+import org.funkwhale.ffa.utils.Artist
+import org.funkwhale.ffa.utils.ArtistsCache
+import org.funkwhale.ffa.utils.ArtistsResponse
+import org.funkwhale.ffa.utils.OtterResponse
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,4 +15,4 @@ class ArtistsRepository(override val context: Context?) : Repository<Artist, Art
 
   override fun cache(data: List<Artist>) = ArtistsCache(data)
   override fun uncache(reader: BufferedReader) = gsonDeserializerOf(ArtistsCache::class.java).deserialize(reader)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/FavoritesRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/FavoritesRepository.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/repositories/FavoritesRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/FavoritesRepository.kt
index 1de5b27..f4d0d3c 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/FavoritesRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/FavoritesRepository.kt
@@ -1,8 +1,8 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitByteArrayResponseResult
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
@@ -32,7 +32,7 @@ class FavoritesRepository(override val context: Context?) : Repository<Track, Tr
 
       track.bestUpload()?.let { upload ->
         maybeNormalizeUrl(upload.listen_url)?.let { url ->
-          track.cached = Otter.get().exoCache.isCached(url, 0, upload.duration * 1000L)
+          track.cached = FFA.get().exoCache.isCached(url, 0, upload.duration * 1000L)
         }
       }
 
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/HttpUpstream.kt b/app/src/main/java/org/funkwhale/ffa/repositories/HttpUpstream.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/repositories/HttpUpstream.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/HttpUpstream.kt
index 70edb20..10f6552 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/HttpUpstream.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/HttpUpstream.kt
@@ -1,7 +1,7 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.net.Uri
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.core.FuelError
 import com.github.kittinunf.fuel.core.ResponseDeserializable
@@ -104,4 +104,4 @@ class HttpUpstream<D : Any, R : OtterResponse<D>>(val behavior: Behavior, privat
       Result.error(FuelError.wrap(e))
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistTracksRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/PlaylistTracksRepository.kt
similarity index 82%
rename from app/src/main/java/com/github/apognu/otter/repositories/PlaylistTracksRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/PlaylistTracksRepository.kt
index 8ca10e0..cb155d2 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistTracksRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/PlaylistTracksRepository.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.OtterResponse
-import com.github.apognu.otter.utils.PlaylistTrack
-import com.github.apognu.otter.utils.PlaylistTracksCache
-import com.github.apognu.otter.utils.PlaylistTracksResponse
+import org.funkwhale.ffa.utils.OtterResponse
+import org.funkwhale.ffa.utils.PlaylistTrack
+import org.funkwhale.ffa.utils.PlaylistTracksCache
+import org.funkwhale.ffa.utils.PlaylistTracksResponse
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.flow.map
@@ -30,4 +30,4 @@ class PlaylistTracksRepository(override val context: Context?, playlistId: Int)
       track
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/PlaylistsRepository.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/PlaylistsRepository.kt
index cc351ea..a7ef7f9 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/PlaylistsRepository.kt
@@ -1,7 +1,7 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitByteArrayResponseResult
 import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/RadiosRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/RadiosRepository.kt
similarity index 77%
rename from app/src/main/java/com/github/apognu/otter/repositories/RadiosRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/RadiosRepository.kt
index 1f16598..8eb3ba5 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/RadiosRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/RadiosRepository.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.OtterResponse
-import com.github.apognu.otter.utils.Radio
-import com.github.apognu.otter.utils.RadiosCache
-import com.github.apognu.otter.utils.RadiosResponse
+import org.funkwhale.ffa.utils.OtterResponse
+import org.funkwhale.ffa.utils.Radio
+import org.funkwhale.ffa.utils.RadiosCache
+import org.funkwhale.ffa.utils.RadiosResponse
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -21,4 +21,4 @@ class RadiosRepository(override val context: Context?) : Repository<Radio, Radio
       .map { radio -> radio.apply { radio_type = "custom" } }
       .toMutableList()
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/Repository.kt
similarity index 91%
rename from app/src/main/java/com/github/apognu/otter/repositories/Repository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/Repository.kt
index 290a906..e9308aa 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/Repository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/Repository.kt
@@ -1,9 +1,9 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.utils.AppContext
-import com.github.apognu.otter.utils.Cache
-import com.github.apognu.otter.utils.CacheItem
+import org.funkwhale.ffa.utils.AppContext
+import org.funkwhale.ffa.utils.Cache
+import org.funkwhale.ffa.utils.CacheItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/SearchRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/SearchRepository.kt
similarity index 91%
rename from app/src/main/java/com/github/apognu/otter/repositories/SearchRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/SearchRepository.kt
index 7348aa4..c8bda24 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/SearchRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/SearchRepository.kt
@@ -1,8 +1,8 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.flow.map
@@ -33,7 +33,7 @@ class TracksSearchRepository(override val context: Context?, var query: String)
       track.bestUpload()?.let { upload ->
         val url = mustNormalizeUrl(upload.listen_url)
 
-        track.cached = Otter.get().exoCache.isCached(url, 0, upload.duration * 1000L)
+        track.cached = FFA.get().exoCache.isCached(url, 0, upload.duration * 1000L)
       }
 
       track
@@ -57,4 +57,4 @@ class AlbumsSearchRepository(override val context: Context?, var query: String)
 
   override fun cache(data: List<Album>) = AlbumsCache(data)
   override fun uncache(reader: BufferedReader) = gsonDeserializerOf(AlbumsCache::class.java).deserialize(reader)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt b/app/src/main/java/org/funkwhale/ffa/repositories/TracksRepository.kt
similarity index 86%
rename from app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt
rename to app/src/main/java/org/funkwhale/ffa/repositories/TracksRepository.kt
index e354f74..d936a8b 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt
+++ b/app/src/main/java/org/funkwhale/ffa/repositories/TracksRepository.kt
@@ -1,8 +1,8 @@
-package com.github.apognu.otter.repositories
+package org.funkwhale.ffa.repositories
 
 import android.content.Context
-import com.github.apognu.otter.Otter
-import com.github.apognu.otter.utils.*
+import org.funkwhale.ffa.FFA
+import org.funkwhale.ffa.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.android.exoplayer2.offline.Download
 import com.google.gson.reflect.TypeToken
@@ -20,7 +20,7 @@ class TracksRepository(override val context: Context?, albumId: Int) : Repositor
 
   companion object {
     fun getDownloadedIds(): List<Int>? {
-      val cursor = Otter.get().exoDownloadManager.downloadIndex.getDownloads()
+      val cursor = FFA.get().exoDownloadManager.downloadIndex.getDownloads()
       val ids: MutableList<Int> = mutableListOf()
 
       while (cursor.moveToNext()) {
@@ -52,10 +52,10 @@ class TracksRepository(override val context: Context?, albumId: Int) : Repositor
       track.bestUpload()?.let { upload ->
         val url = mustNormalizeUrl(upload.listen_url)
 
-        track.cached = Otter.get().exoCache.isCached(url, 0, upload.duration * 1000L)
+        track.cached = FFA.get().exoCache.isCached(url, 0, upload.duration * 1000L)
       }
 
       track
     }.sortedWith(compareBy({ it.disc_number }, { it.position }))
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt b/app/src/main/java/org/funkwhale/ffa/utils/AppContext.kt
similarity index 97%
rename from app/src/main/java/com/github/apognu/otter/utils/AppContext.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/AppContext.kt
index 99459db..c7f4806 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/AppContext.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -8,7 +8,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import com.github.apognu.otter.R
+import org.funkwhale.ffa.R
 import com.github.kittinunf.fuel.core.FuelManager
 import com.github.kittinunf.fuel.core.Method
 
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Bus.kt b/app/src/main/java/org/funkwhale/ffa/utils/Bus.kt
similarity index 86%
rename from app/src/main/java/com/github/apognu/otter/utils/Bus.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Bus.kt
index b88728b..b1acc72 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Bus.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Bus.kt
@@ -1,6 +1,6 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
-import com.github.apognu.otter.Otter
+import org.funkwhale.ffa.FFA
 import com.google.android.exoplayer2.offline.Download
 import com.google.android.exoplayer2.offline.DownloadCursor
 import kotlinx.coroutines.Dispatchers.IO
@@ -71,21 +71,21 @@ sealed class Response {
 object EventBus {
   fun send(event: Event) {
     GlobalScope.launch(IO) {
-      Otter.get().eventBus.offer(event)
+      FFA.get().eventBus.offer(event)
     }
   }
 
-  fun get() = Otter.get().eventBus.asFlow()
+  fun get() = FFA.get().eventBus.asFlow()
 }
 
 object CommandBus {
   fun send(command: Command) {
     GlobalScope.launch(IO) {
-      Otter.get().commandBus.offer(command)
+      FFA.get().commandBus.offer(command)
     }
   }
 
-  fun get() = Otter.get().commandBus.asFlow()
+  fun get() = FFA.get().commandBus.asFlow()
 }
 
 object RequestBus {
@@ -94,22 +94,22 @@ object RequestBus {
       GlobalScope.launch(IO) {
         request.channel = it
 
-        Otter.get().requestBus.offer(request)
+        FFA.get().requestBus.offer(request)
       }
     }
   }
 
-  fun get() = Otter.get().requestBus.asFlow()
+  fun get() = FFA.get().requestBus.asFlow()
 }
 
 object ProgressBus {
   fun send(current: Int, duration: Int, percent: Int) {
     GlobalScope.launch(IO) {
-      Otter.get().progressBus.send(Triple(current, duration, percent))
+      FFA.get().progressBus.send(Triple(current, duration, percent))
     }
   }
 
-  fun get() = Otter.get().progressBus.asFlow().conflate()
+  fun get() = FFA.get().progressBus.asFlow().conflate()
 }
 
 suspend inline fun <reified T> Channel<Response>.wait(): T? {
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Data.kt b/app/src/main/java/org/funkwhale/ffa/utils/Data.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/utils/Data.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Data.kt
index 1eb5883..6ae83fd 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Data.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Data.kt
@@ -1,7 +1,7 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import android.content.Context
-import com.github.apognu.otter.activities.FwCredentials
+import org.funkwhale.ffa.activities.FwCredentials
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.core.FuelError
 import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult
@@ -95,4 +95,4 @@ object Cache {
       delete()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Extensions.kt b/app/src/main/java/org/funkwhale/ffa/utils/Extensions.kt
similarity index 91%
rename from app/src/main/java/com/github/apognu/otter/utils/Extensions.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Extensions.kt
index 64a1fa7..5e3c6d8 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Extensions.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Extensions.kt
@@ -1,10 +1,10 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import android.os.Build
 import androidx.fragment.app.Fragment
-import com.github.apognu.otter.R
-import com.github.apognu.otter.fragments.BrowseFragment
-import com.github.apognu.otter.repositories.Repository
+import org.funkwhale.ffa.R
+import org.funkwhale.ffa.fragments.BrowseFragment
+import org.funkwhale.ffa.repositories.Repository
 import com.github.kittinunf.fuel.core.Request
 import com.google.android.exoplayer2.offline.Download
 import com.google.gson.Gson
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Models.kt b/app/src/main/java/org/funkwhale/ffa/utils/Models.kt
similarity index 99%
rename from app/src/main/java/com/github/apognu/otter/utils/Models.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Models.kt
index 600e975..a815d89 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Models.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Models.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import com.google.android.exoplayer2.offline.Download
 import com.preference.PowerPreference
@@ -176,4 +176,4 @@ data class DownloadInfo(
   val title: String,
   val artist: String,
   var download: Download?
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Userinfo.kt b/app/src/main/java/org/funkwhale/ffa/utils/Userinfo.kt
similarity index 95%
rename from app/src/main/java/com/github/apognu/otter/utils/Userinfo.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Userinfo.kt
index 823a069..3408eff 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Userinfo.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Userinfo.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult
@@ -31,4 +31,4 @@ object Userinfo {
       return null
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Util.kt b/app/src/main/java/org/funkwhale/ffa/utils/Util.kt
similarity index 96%
rename from app/src/main/java/com/github/apognu/otter/utils/Util.kt
rename to app/src/main/java/org/funkwhale/ffa/utils/Util.kt
index f768852..67012e6 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Util.kt
+++ b/app/src/main/java/org/funkwhale/ffa/utils/Util.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.utils
+package org.funkwhale.ffa.utils
 
 import android.content.Context
 import android.widget.Toast
@@ -16,7 +16,7 @@ private fun logClassName(): String {
   val known = setOf(
     "dalvik.system.VMStack",
     "java.lang.Thread",
-    "com.github.apognu.otter.utils.UtilKt"
+    "org.funkwhale.ffa.utils.UtilKt"
   )
 
   Thread.currentThread().stackTrace.forEach {
diff --git a/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt b/app/src/main/java/org/funkwhale/ffa/views/DisableableFrameLayout.kt
similarity index 94%
rename from app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
rename to app/src/main/java/org/funkwhale/ffa/views/DisableableFrameLayout.kt
index 84bdcbf..dab718a 100644
--- a/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
+++ b/app/src/main/java/org/funkwhale/ffa/views/DisableableFrameLayout.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.views
+package org.funkwhale.ffa.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/com/github/apognu/otter/views/LoadingImageView.kt b/app/src/main/java/org/funkwhale/ffa/views/LoadingImageView.kt
similarity index 92%
rename from app/src/main/java/com/github/apognu/otter/views/LoadingImageView.kt
rename to app/src/main/java/org/funkwhale/ffa/views/LoadingImageView.kt
index dac349a..fc982f2 100644
--- a/app/src/main/java/com/github/apognu/otter/views/LoadingImageView.kt
+++ b/app/src/main/java/org/funkwhale/ffa/views/LoadingImageView.kt
@@ -1,11 +1,11 @@
-package com.github.apognu.otter.views
+package org.funkwhale.ffa.views
 
 import android.animation.ObjectAnimator
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
-import com.github.apognu.otter.R
+import org.funkwhale.ffa.R
 
 object LoadingImageView {
   fun start(context: Context?, image: ImageView): ObjectAnimator? {
@@ -32,4 +32,4 @@ object LoadingImageView {
       image.rotation = 0.0f
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/views/NowPlayingView.kt b/app/src/main/java/org/funkwhale/ffa/views/NowPlayingView.kt
similarity index 98%
rename from app/src/main/java/com/github/apognu/otter/views/NowPlayingView.kt
rename to app/src/main/java/org/funkwhale/ffa/views/NowPlayingView.kt
index 3e51700..87fbbdd 100644
--- a/app/src/main/java/com/github/apognu/otter/views/NowPlayingView.kt
+++ b/app/src/main/java/org/funkwhale/ffa/views/NowPlayingView.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.views
+package org.funkwhale.ffa.views
 
 import android.animation.ValueAnimator
 import android.content.Context
@@ -9,7 +9,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewTreeObserver
 import android.view.animation.DecelerateInterpolator
-import com.github.apognu.otter.R
+import org.funkwhale.ffa.R
 import com.google.android.material.card.MaterialCardView
 import kotlinx.android.synthetic.main.partial_now_playing.view.*
 import kotlin.math.abs
diff --git a/app/src/main/java/com/github/apognu/otter/views/SquareImageView.kt b/app/src/main/java/org/funkwhale/ffa/views/SquareImageView.kt
similarity index 93%
rename from app/src/main/java/com/github/apognu/otter/views/SquareImageView.kt
rename to app/src/main/java/org/funkwhale/ffa/views/SquareImageView.kt
index 79a247e..396cccd 100644
--- a/app/src/main/java/com/github/apognu/otter/views/SquareImageView.kt
+++ b/app/src/main/java/org/funkwhale/ffa/views/SquareImageView.kt
@@ -1,4 +1,4 @@
-package com.github.apognu.otter.views
+package org.funkwhale.ffa.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -14,4 +14,4 @@ class SquareImageView : AppCompatImageView {
 
     setMeasuredDimension(measuredWidth, measuredWidth)
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index f4706f8..0c6e1d9 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -29,7 +29,7 @@
 
   </LinearLayout>
 
-  <com.github.apognu.otter.views.NowPlayingView
+  <org.funkwhale.ffa.views.NowPlayingView
     android:id="@+id/now_playing"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
@@ -45,7 +45,7 @@
 
     <include layout="@layout/partial_now_playing" />
 
-  </com.github.apognu.otter.views.NowPlayingView>
+  </org.funkwhale.ffa.views.NowPlayingView>
 
   <com.google.android.material.bottomappbar.BottomAppBar
     android:id="@+id/appbar"
@@ -58,4 +58,4 @@
     app:navigationIcon="@drawable/funkwhaleshape"
     tools:menu="@menu/toolbar" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-land/fragment_tracks.xml b/app/src/main/res/layout-land/fragment_tracks.xml
index 2424640..4e3a41b 100644
--- a/app/src/main/res/layout-land/fragment_tracks.xml
+++ b/app/src/main/res/layout-land/fragment_tracks.xml
@@ -79,7 +79,7 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent=".50" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_top_left"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -91,7 +91,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_top_right"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -103,7 +103,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_bottom_left"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -115,7 +115,7 @@
                 app:layout_constraintTop_toTopOf="@id/vertical"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_bottom_right"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -209,4 +209,4 @@
 
   </androidx.core.widget.NestedScrollView>
 
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout-land/partial_now_playing.xml b/app/src/main/res/layout-land/partial_now_playing.xml
index 6d50f6c..69f0e54 100644
--- a/app/src/main/res/layout-land/partial_now_playing.xml
+++ b/app/src/main/res/layout-land/partial_now_playing.xml
@@ -35,7 +35,7 @@
         android:layout_height="?attr/actionBarSize"
         android:layout_marginEnd="16dp">
 
-        <com.github.apognu.otter.views.SquareImageView
+        <org.funkwhale.ffa.views.SquareImageView
           android:id="@+id/now_playing_cover"
           android:layout_width="?attr/actionBarSize"
           android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5591472..fba401d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,14 +5,14 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <com.github.apognu.otter.views.DisableableFrameLayout
+  <org.funkwhale.ffa.views.DisableableFrameLayout
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="?attr/actionBarSize"
     app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-  <com.github.apognu.otter.views.NowPlayingView
+  <org.funkwhale.ffa.views.NowPlayingView
     android:id="@+id/now_playing"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
@@ -28,7 +28,7 @@
 
     <include layout="@layout/partial_now_playing" />
 
-  </com.github.apognu.otter.views.NowPlayingView>
+  </org.funkwhale.ffa.views.NowPlayingView>
 
   <com.google.android.material.bottomappbar.BottomAppBar
     android:id="@+id/appbar"
@@ -41,4 +41,4 @@
     app:navigationIcon="@drawable/funkwhaleshape"
     tools:menu="@menu/toolbar" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_tracks.xml b/app/src/main/res/layout/fragment_tracks.xml
index 94b55c9..e828c67 100644
--- a/app/src/main/res/layout/fragment_tracks.xml
+++ b/app/src/main/res/layout/fragment_tracks.xml
@@ -81,7 +81,7 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent=".50" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_top_left"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -93,7 +93,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_top_right"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -105,7 +105,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_bottom_left"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -117,7 +117,7 @@
                 app:layout_constraintTop_toTopOf="@id/vertical"
                 tools:src="@tools:sample/avatars" />
 
-              <com.github.apognu.otter.views.SquareImageView
+              <org.funkwhale.ffa.views.SquareImageView
                 android:id="@+id/cover_bottom_right"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -211,4 +211,4 @@
 
   </androidx.core.widget.NestedScrollView>
 
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/partial_now_playing.xml b/app/src/main/res/layout/partial_now_playing.xml
index 16589a5..eef06e8 100644
--- a/app/src/main/res/layout/partial_now_playing.xml
+++ b/app/src/main/res/layout/partial_now_playing.xml
@@ -35,7 +35,7 @@
         android:layout_height="?attr/actionBarSize"
         android:layout_marginEnd="16dp">
 
-        <com.github.apognu.otter.views.SquareImageView
+        <org.funkwhale.ffa.views.SquareImageView
           android:id="@+id/now_playing_cover"
           android:layout_width="?attr/actionBarSize"
           android:layout_height="?attr/actionBarSize"
@@ -111,7 +111,7 @@
       android:layout_weight="1"
       android:padding="8dp">
 
-      <com.github.apognu.otter.views.SquareImageView
+      <org.funkwhale.ffa.views.SquareImageView
         android:id="@+id/now_playing_details_cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/row_album.xml b/app/src/main/res/layout/row_album.xml
index 5dfebfb..0796227 100644
--- a/app/src/main/res/layout/row_album.xml
+++ b/app/src/main/res/layout/row_album.xml
@@ -12,7 +12,7 @@
   android:transitionGroup="true"
   tools:showIn="@layout/fragment_albums">
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/art"
     android:layout_width="48dp"
     android:layout_height="wrap_content"
@@ -53,4 +53,4 @@
     android:layout_weight="0"
     android:background="@drawable/pill" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_album_grid.xml b/app/src/main/res/layout/row_album_grid.xml
index 00adbe7..4f057cd 100644
--- a/app/src/main/res/layout/row_album_grid.xml
+++ b/app/src/main/res/layout/row_album_grid.xml
@@ -9,7 +9,7 @@
   android:transitionGroup="true"
   tools:showIn="@layout/fragment_albums_grid">
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/cover"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -25,4 +25,4 @@
     android:textAlignment="center"
     tools:text="Black holes and revelations" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_artist.xml b/app/src/main/res/layout/row_artist.xml
index a0dca50..4eabd5d 100644
--- a/app/src/main/res/layout/row_artist.xml
+++ b/app/src/main/res/layout/row_artist.xml
@@ -12,7 +12,7 @@
   android:transitionGroup="true"
   tools:showIn="@layout/fragment_artists">
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/art"
     android:layout_width="48dp"
     android:layout_height="wrap_content"
@@ -45,4 +45,4 @@
 
   </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_playlist.xml b/app/src/main/res/layout/row_playlist.xml
index a0438f8..711032d 100644
--- a/app/src/main/res/layout/row_playlist.xml
+++ b/app/src/main/res/layout/row_playlist.xml
@@ -35,7 +35,7 @@
       android:orientation="horizontal"
       app:layout_constraintGuide_percent=".50" />
 
-    <com.github.apognu.otter.views.SquareImageView
+    <org.funkwhale.ffa.views.SquareImageView
       android:id="@+id/cover_top_left"
       android:layout_width="0dp"
       android:layout_height="0dp"
@@ -47,7 +47,7 @@
       app:layout_constraintTop_toTopOf="parent"
       tools:src="@tools:sample/avatars" />
 
-    <com.github.apognu.otter.views.SquareImageView
+    <org.funkwhale.ffa.views.SquareImageView
       android:id="@+id/cover_top_right"
       android:layout_width="0dp"
       android:layout_height="0dp"
@@ -59,7 +59,7 @@
       app:layout_constraintTop_toTopOf="parent"
       tools:src="@tools:sample/avatars" />
 
-    <com.github.apognu.otter.views.SquareImageView
+    <org.funkwhale.ffa.views.SquareImageView
       android:id="@+id/cover_bottom_left"
       android:layout_width="0dp"
       android:layout_height="0dp"
@@ -71,7 +71,7 @@
       app:layout_constraintTop_toTopOf="@id/vertical"
       tools:src="@tools:sample/avatars" />
 
-    <com.github.apognu.otter.views.SquareImageView
+    <org.funkwhale.ffa.views.SquareImageView
       android:id="@+id/cover_bottom_right"
       android:layout_width="0dp"
       android:layout_height="0dp"
@@ -112,4 +112,4 @@
 
   </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/row_radio.xml b/app/src/main/res/layout/row_radio.xml
index db13880..7e59dcf 100644
--- a/app/src/main/res/layout/row_radio.xml
+++ b/app/src/main/res/layout/row_radio.xml
@@ -12,7 +12,7 @@
   android:transitionGroup="true"
   tools:showIn="@layout/fragment_radios">
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/art"
     android:layout_width="48dp"
     android:layout_height="wrap_content"
@@ -47,4 +47,4 @@
 
   </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_track.xml b/app/src/main/res/layout/row_track.xml
index ddb3931..80c5ea8 100644
--- a/app/src/main/res/layout/row_track.xml
+++ b/app/src/main/res/layout/row_track.xml
@@ -12,7 +12,7 @@
   android:transitionGroup="true"
   tools:showIn="@layout/fragment_tracks">
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/handle"
     android:layout_width="18dp"
     android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
     android:visibility="gone"
     tools:visibility="visible" />
 
-  <com.github.apognu.otter.views.SquareImageView
+  <org.funkwhale.ffa.views.SquareImageView
     android:id="@+id/cover"
     android:layout_width="48dp"
     android:layout_height="wrap_content"
diff --git a/build.gradle.kts b/build.gradle.kts
index fa47394..42e3e4f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:4.2.1")
+    classpath("com.android.tools.build:gradle:4.2.2")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
   }
 }