diff --git a/app/build.gradle b/app/build.gradle
index 483804f1b..be4098181 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,6 @@ plugins {
 }
 
 def gitCommits = 'git rev-list --count HEAD'.execute([], rootDir).text.trim().toInteger()
-def gitBranch = 'git branch --show-current'.execute([], rootDir).text.trim()
 
 android {
 	compileSdkVersion 29
@@ -98,5 +97,5 @@ dependencies {
 	releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.2.0'
 
 	testImplementation 'junit:junit:4.13'
-	testImplementation 'org.json:json:20190722'
+	testImplementation 'org.json:json:20200518'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3964989bb..7d5df3091 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
 		android:theme="@style/AppTheme"
 		android:usesCleartextTraffic="true"
 		tools:ignore="UnusedAttribute">
-		<activity android:name=".ui.main.MainActivity">
+		<activity android:name=".ui.list.MainActivity">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -59,7 +59,7 @@
 			android:theme="@android:style/Theme.DeviceDefault.Dialog"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
-			android:name=".ui.main.list.favourites.categories.CategoriesActivity"
+			android:name="org.koitharu.kotatsu.ui.list.favourites.categories.CategoriesActivity"
 			android:label="@string/favourites_categories"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt
index a46756884..68846901b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt
@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.ui.common.BaseFragment
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.select.FavouriteCategoriesDialog
+import org.koitharu.kotatsu.ui.list.favourites.categories.select.FavouriteCategoriesDialog
 import org.koitharu.kotatsu.ui.reader.ReaderActivity
 import org.koitharu.kotatsu.ui.search.MangaSearchSheet
 import org.koitharu.kotatsu.utils.FileSizeUtils
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/ListModeSelectDialog.kt
similarity index 93%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/ListModeSelectDialog.kt
index e9bff691b..5ca1bdb28 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/ListModeSelectDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/ListModeSelectDialog.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.os.Bundle
 import android.view.View
@@ -55,6 +55,9 @@ class ListModeSelectDialog : AlertDialogFragment(R.layout.dialog_list_mode), Vie
 
 		private const val TAG = "ListModeSelectDialog"
 
-		fun show(fm: FragmentManager) = ListModeSelectDialog().show(fm, TAG)
+		fun show(fm: FragmentManager) = ListModeSelectDialog()
+			.show(fm,
+				TAG
+			)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
similarity index 94%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
index d3341351c..b2aabcf64 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main
+package org.koitharu.kotatsu.ui.list
 
 import android.app.ActivityOptions
 import android.content.SharedPreferences
@@ -25,11 +25,11 @@ import org.koitharu.kotatsu.core.prefs.AppSection
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.ui.common.BaseActivity
-import org.koitharu.kotatsu.ui.main.list.favourites.FavouritesContainerFragment
-import org.koitharu.kotatsu.ui.main.list.history.HistoryListFragment
-import org.koitharu.kotatsu.ui.main.list.local.LocalListFragment
-import org.koitharu.kotatsu.ui.main.list.remote.RemoteListFragment
-import org.koitharu.kotatsu.ui.main.tracklogs.FeedFragment
+import org.koitharu.kotatsu.ui.list.favourites.FavouritesContainerFragment
+import org.koitharu.kotatsu.ui.list.history.HistoryListFragment
+import org.koitharu.kotatsu.ui.list.local.LocalListFragment
+import org.koitharu.kotatsu.ui.list.remote.RemoteListFragment
+import org.koitharu.kotatsu.ui.list.tracklogs.FeedFragment
 import org.koitharu.kotatsu.ui.reader.ReaderActivity
 import org.koitharu.kotatsu.ui.reader.ReaderState
 import org.koitharu.kotatsu.ui.settings.AppUpdateService
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainPresenter.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/MainPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MainPresenter.kt
index 1fe403099..74428726d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main
+package org.koitharu.kotatsu.ui.list
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainView.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainView.kt
similarity index 86%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/MainView.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MainView.kt
index 45859cd12..2c33e191e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main
+package org.koitharu.kotatsu.ui.list
 
 import moxy.viewstate.strategy.alias.OneExecution
 import org.koitharu.kotatsu.ui.common.BaseMvpView
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaGridHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaGridHolder.kt
similarity index 94%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaGridHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaGridHolder.kt
index 66b37b573..9344bb313 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaGridHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaGridHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.view.ViewGroup
 import coil.api.clear
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListAdapter.kt
similarity index 88%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListAdapter.kt
index 42b3a48bf..cd9a9dbfd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.view.ViewGroup
 import org.koitharu.kotatsu.core.model.Manga
@@ -14,7 +14,9 @@ class MangaListAdapter(onItemClickListener: OnRecyclerItemClickListener<Manga>)
 
 	override fun onCreateViewHolder(parent: ViewGroup) = when(listMode) {
 		ListMode.LIST -> MangaListHolder(parent)
-		ListMode.DETAILED_LIST -> MangaListDetailsHolder(parent)
+		ListMode.DETAILED_LIST -> MangaListDetailsHolder(
+			parent
+		)
 		ListMode.GRID -> MangaGridHolder(parent)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListDetailsHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListDetailsHolder.kt
similarity index 96%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListDetailsHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListDetailsHolder.kt
index b08fcf226..06e969740 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListDetailsHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListDetailsHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListFragment.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListFragment.kt
index 78e1614df..2e291db54 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -32,12 +32,13 @@ import org.koitharu.kotatsu.ui.common.list.decor.ItemTypeDividerDecoration
 import org.koitharu.kotatsu.ui.common.list.decor.SectionItemDecoration
 import org.koitharu.kotatsu.ui.common.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
-import org.koitharu.kotatsu.ui.main.list.filter.FilterAdapter
-import org.koitharu.kotatsu.ui.main.list.filter.OnFilterChangedListener
+import org.koitharu.kotatsu.ui.list.filter.FilterAdapter
+import org.koitharu.kotatsu.ui.list.filter.OnFilterChangedListener
 import org.koitharu.kotatsu.utils.UiUtils
 import org.koitharu.kotatsu.utils.ext.*
 
-abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), MangaListView<E>,
+abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list),
+	MangaListView<E>,
 	PaginationScrollListener.Callback, OnRecyclerItemClickListener<Manga>,
 	SharedPreferences.OnSharedPreferenceChangeListener, OnFilterChangedListener,
 	SectionItemDecoration.Callback, SwipeRefreshLayout.OnRefreshListener {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListHolder.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListHolder.kt
index faab1e8fb..777d95ccd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.view.ViewGroup
 import coil.api.clear
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListSheet.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListSheet.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListSheet.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListSheet.kt
index 02e16a750..85d95bcb5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListSheet.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -32,7 +32,8 @@ import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
 import org.koitharu.kotatsu.utils.UiUtils
 import org.koitharu.kotatsu.utils.ext.*
 
-abstract class MangaListSheet<E> : BaseBottomSheet(R.layout.sheet_list), MangaListView<E>,
+abstract class MangaListSheet<E> : BaseBottomSheet(R.layout.sheet_list),
+	MangaListView<E>,
 	PaginationScrollListener.Callback, OnRecyclerItemClickListener<Manga>,
 	SharedPreferences.OnSharedPreferenceChangeListener, Toolbar.OnMenuItemClickListener {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListView.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListView.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListView.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListView.kt
index 9201c6186..9df53d158 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list
+package org.koitharu.kotatsu.ui.list
 
 import moxy.viewstate.strategy.AddToEndSingleTagStrategy
 import moxy.viewstate.strategy.AddToEndStrategy
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesContainerFragment.kt
similarity index 89%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesContainerFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesContainerFragment.kt
index 39849637c..781badd2f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesContainerFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites
+package org.koitharu.kotatsu.ui.list.favourites
 
 import android.os.Bundle
 import android.view.Menu
@@ -14,9 +14,9 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
 import org.koitharu.kotatsu.domain.favourites.OnFavouritesChangeListener
 import org.koitharu.kotatsu.ui.common.BaseFragment
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.CategoriesActivity
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesPresenter
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesView
+import org.koitharu.kotatsu.ui.list.favourites.categories.CategoriesActivity
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesPresenter
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesView
 import java.util.*
 import kotlin.collections.ArrayList
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListFragment.kt
similarity index 78%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListFragment.kt
index 00fa6f679..025b0dee7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListFragment.kt
@@ -1,13 +1,14 @@
-package org.koitharu.kotatsu.ui.main.list.favourites
+package org.koitharu.kotatsu.ui.list.favourites
 
 import kotlinx.android.synthetic.main.fragment_list.*
 import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.ui.main.list.MangaListFragment
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListFragment
+import org.koitharu.kotatsu.ui.list.MangaListView
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class FavouritesListFragment : MangaListFragment<Unit>(), MangaListView<Unit> {
+class FavouritesListFragment : MangaListFragment<Unit>(),
+	MangaListView<Unit> {
 
 	private val presenter by moxyPresenter(factory = ::FavouritesListPresenter)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListPresenter.kt
similarity index 92%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListPresenter.kt
index 037b03eb0..45e1d6cab 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesListPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites
+package org.koitharu.kotatsu.ui.list.favourites
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -9,7 +9,7 @@ import moxy.presenterScope
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
 import org.koitharu.kotatsu.ui.common.BasePresenter
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListView
 
 @InjectViewState
 class FavouritesListPresenter : BasePresenter<MangaListView<Unit>>() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesPagerAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesPagerAdapter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesPagerAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesPagerAdapter.kt
index 724dd2b85..c8ddc7c8c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesPagerAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/FavouritesPagerAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites
+package org.koitharu.kotatsu.ui.list.favourites
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesActivity.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesActivity.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesActivity.kt
index 61f2aee3e..d5f2b1ff1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesActivity.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories
+package org.koitharu.kotatsu.ui.list.favourites.categories
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesAdapter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesAdapter.kt
index 95cfec6ea..3f8921199 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoriesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoriesAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories
+package org.koitharu.kotatsu.ui.list.favourites.categories
 
 import android.annotation.SuppressLint
 import android.view.MotionEvent
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoryHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoryHolder.kt
similarity index 87%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoryHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoryHolder.kt
index 90a8b830a..f77e66454 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/CategoryHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/CategoryHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories
+package org.koitharu.kotatsu.ui.list.favourites.categories
 
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.item_category.*
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesPresenter.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesPresenter.kt
index 296a6e9fc..48ae65554 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories
+package org.koitharu.kotatsu.ui.list.favourites.categories
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesView.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesView.kt
similarity index 90%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesView.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesView.kt
index fd6f0fbd6..484d3d54b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/FavouriteCategoriesView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/FavouriteCategoriesView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories
+package org.koitharu.kotatsu.ui.list.favourites.categories
 
 import moxy.MvpView
 import moxy.viewstate.strategy.AddToEndSingleStrategy
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoriesSelectAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoriesSelectAdapter.kt
similarity index 94%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoriesSelectAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoriesSelectAdapter.kt
index 676e53cd7..fbd82eaa5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoriesSelectAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoriesSelectAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories.select
+package org.koitharu.kotatsu.ui.list.favourites.categories.select
 
 import android.util.SparseBooleanArray
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoryCheckableHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoryCheckableHolder.kt
similarity index 87%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoryCheckableHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoryCheckableHolder.kt
index 7069870ea..4a29cb5d9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/CategoryCheckableHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/CategoryCheckableHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories.select
+package org.koitharu.kotatsu.ui.list.favourites.categories.select
 
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.item_category_checkable.*
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/FavouriteCategoriesDialog.kt
similarity index 91%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/FavouriteCategoriesDialog.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/FavouriteCategoriesDialog.kt
index 93a9123c3..62e4b1eec 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/FavouriteCategoriesDialog.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories.select
+package org.koitharu.kotatsu.ui.list.favourites.categories.select
 
 import android.os.Bundle
 import android.text.InputType
@@ -12,8 +12,8 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.ui.common.BaseBottomSheet
 import org.koitharu.kotatsu.ui.common.dialog.TextInputDialog
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesPresenter
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesView
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesPresenter
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesView
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/OnCategoryCheckListener.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/OnCategoryCheckListener.kt
similarity index 73%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/OnCategoryCheckListener.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/OnCategoryCheckListener.kt
index ea55b245b..f9aa985da 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/categories/select/OnCategoryCheckListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/favourites/categories/select/OnCategoryCheckListener.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.favourites.categories.select
+package org.koitharu.kotatsu.ui.list.favourites.categories.select
 
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterAdapter.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterAdapter.kt
index 0e543b8df..cbd840538 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.filter
+package org.koitharu.kotatsu.ui.list.filter
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterSortHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterSortHolder.kt
similarity index 90%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterSortHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterSortHolder.kt
index 2f66ffbda..66d6c60dc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterSortHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterSortHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.filter
+package org.koitharu.kotatsu.ui.list.filter
 
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.item_checkable_single.*
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterTagHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterTagHolder.kt
similarity index 90%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterTagHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterTagHolder.kt
index e44150478..74200e26c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/FilterTagHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/FilterTagHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.filter
+package org.koitharu.kotatsu.ui.list.filter
 
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.item_checkable_single.*
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/OnFilterChangedListener.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/OnFilterChangedListener.kt
similarity index 72%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/OnFilterChangedListener.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/filter/OnFilterChangedListener.kt
index 077114921..a52916b5b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/filter/OnFilterChangedListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/filter/OnFilterChangedListener.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.filter
+package org.koitharu.kotatsu.ui.list.filter
 
 import org.koitharu.kotatsu.core.model.MangaFilter
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListFragment.kt
similarity index 89%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListFragment.kt
index 55ed04fac..cf338ec91 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.history
+package org.koitharu.kotatsu.ui.list.history
 
 import android.view.Menu
 import android.view.MenuInflater
@@ -10,11 +10,12 @@ import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.ui.main.list.MangaListFragment
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListFragment
+import org.koitharu.kotatsu.ui.list.MangaListView
 import org.koitharu.kotatsu.utils.ext.ellipsize
 
-class HistoryListFragment : MangaListFragment<MangaHistory>(), MangaListView<MangaHistory> {
+class HistoryListFragment : MangaListFragment<MangaHistory>(),
+	MangaListView<MangaHistory> {
 
 	private val presenter by moxyPresenter(factory = ::HistoryListPresenter)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
index 535d5a576..37d09c0c8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.history
+package org.koitharu.kotatsu.ui.list.history
 
 import android.os.Build
 import kotlinx.coroutines.CancellationException
@@ -13,7 +13,7 @@ import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.domain.history.HistoryRepository
 import org.koitharu.kotatsu.ui.common.BasePresenter
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListView
 import org.koitharu.kotatsu.utils.MangaShortcut
 
 @InjectViewState
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListFragment.kt
similarity index 96%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListFragment.kt
index 58998f245..7c55fc083 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.local
+package org.koitharu.kotatsu.ui.list.local
 
 import android.content.ActivityNotFoundException
 import android.net.Uri
@@ -14,7 +14,7 @@ import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.ui.main.list.MangaListFragment
+import org.koitharu.kotatsu.ui.list.MangaListFragment
 import org.koitharu.kotatsu.utils.ext.ellipsize
 import java.io.File
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
similarity index 96%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
index 66dbaee8e..444c50825 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.local
+package org.koitharu.kotatsu.ui.list.local
 
 import android.content.Context
 import android.net.Uri
@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.domain.history.HistoryRepository
 import org.koitharu.kotatsu.ui.common.BasePresenter
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListView
 import org.koitharu.kotatsu.utils.MangaShortcut
 import org.koitharu.kotatsu.utils.MediaStoreCompat
 import org.koitharu.kotatsu.utils.ext.safe
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListFragment.kt
similarity index 91%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListFragment.kt
index 5e8822ce8..f085b479d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.remote
+package org.koitharu.kotatsu.ui.list.remote
 
 import android.view.Menu
 import android.view.MenuInflater
@@ -6,7 +6,7 @@ import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaFilter
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.ui.main.list.MangaListFragment
+import org.koitharu.kotatsu.ui.list.MangaListFragment
 import org.koitharu.kotatsu.ui.search.SearchHelper
 import org.koitharu.kotatsu.utils.ext.withArgs
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListPresenter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListPresenter.kt
index 638cc457a..71f3631b5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/remote/RemoteListPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.list.remote
+package org.koitharu.kotatsu.ui.list.remote
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.core.model.MangaFilter
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.ui.common.BasePresenter
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListView
 
 @InjectViewState
 class RemoteListPresenter : BasePresenter<MangaListView<Unit>>() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedAdapter.kt
similarity index 93%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedAdapter.kt
index b5727fdde..56930abd3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.tracklogs
+package org.koitharu.kotatsu.ui.list.tracklogs
 
 import android.view.ViewGroup
 import org.koitharu.kotatsu.core.model.TrackingLogItem
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedFragment.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedFragment.kt
index a2e68177c..3f90f1309 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.tracklogs
+package org.koitharu.kotatsu.ui.list.tracklogs
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedHolder.kt
similarity index 94%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedHolder.kt
index a46d26d1f..2baae71f8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.tracklogs
+package org.koitharu.kotatsu.ui.list.tracklogs
 
 import android.view.ViewGroup
 import coil.api.clear
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedPresenter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedPresenter.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedPresenter.kt
index c865efd5c..748c53e5b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedPresenter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.tracklogs
+package org.koitharu.kotatsu.ui.list.tracklogs
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedView.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedView.kt
similarity index 92%
rename from app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedView.kt
rename to app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedView.kt
index 88bb6ecfd..27ae1d6ca 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/main/tracklogs/FeedView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/tracklogs/FeedView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.ui.main.tracklogs
+package org.koitharu.kotatsu.ui.list.tracklogs
 
 import moxy.viewstate.strategy.AddToEndSingleTagStrategy
 import moxy.viewstate.strategy.AddToEndStrategy
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/search/MangaSearchSheet.kt b/app/src/main/java/org/koitharu/kotatsu/ui/search/MangaSearchSheet.kt
index eb24e8bfc..e92821ebf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/search/MangaSearchSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/search/MangaSearchSheet.kt
@@ -6,7 +6,7 @@ import androidx.fragment.app.FragmentManager
 import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.ui.main.list.MangaListSheet
+import org.koitharu.kotatsu.ui.list.MangaListSheet
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class MangaSearchSheet : MangaListSheet<Unit>() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchFragment.kt
index 0cf073fc1..6487e4555 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchFragment.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.ui.search
 
 import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.ui.main.list.MangaListFragment
+import org.koitharu.kotatsu.ui.list.MangaListFragment
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class SearchFragment : MangaListFragment<Unit>() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchPresenter.kt
index f21bed83b..1c74ea3c4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchPresenter.kt
@@ -10,7 +10,7 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.ui.common.BasePresenter
-import org.koitharu.kotatsu.ui.main.list.MangaListView
+import org.koitharu.kotatsu.ui.list.MangaListView
 
 @InjectViewState
 class SearchPresenter : BasePresenter<MangaListView<Unit>>() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
index 2fefab416..a7cd0b7b2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/MainSettingsFragment.kt
@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.ui.common.BasePreferenceFragment
 import org.koitharu.kotatsu.ui.common.dialog.StorageSelectDialog
-import org.koitharu.kotatsu.ui.main.list.ListModeSelectDialog
+import org.koitharu.kotatsu.ui.list.ListModeSelectDialog
 import org.koitharu.kotatsu.ui.settings.utils.MultiSummaryProvider
 import org.koitharu.kotatsu.ui.tracker.TrackWorker
 import org.koitharu.kotatsu.utils.ext.getStorageName
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/NotificationSettingsLegacyFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/NotificationSettingsLegacyFragment.kt
index 6d5014527..0a598c773 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/NotificationSettingsLegacyFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/NotificationSettingsLegacyFragment.kt
@@ -1,14 +1,11 @@
 package org.koitharu.kotatsu.ui.settings
 
-import android.app.Activity
-import android.content.Intent
 import android.media.RingtoneManager
-import android.net.Uri
 import android.os.Bundle
-import android.provider.Settings
 import androidx.preference.Preference
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.ui.common.BasePreferenceFragment
+import org.koitharu.kotatsu.ui.settings.utils.RingtonePickContract
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
 
 class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notifications) {
@@ -24,43 +21,15 @@ class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notif
 	override fun onPreferenceTreeClick(preference: Preference?): Boolean {
 		return when (preference?.key) {
 			getString(R.string.key_notifications_sound) -> {
-				val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE,
-					RingtoneManager.TYPE_NOTIFICATION)
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
-					Settings.System.DEFAULT_NOTIFICATION_URI)
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, preference.title)
-				val existingValue = settings.notificationSound.toUriOrNull()
-				intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, existingValue)
-				startActivityForResult(intent, REQUEST_RINGTONE)
-				true
-			}
-			else -> super.onPreferenceTreeClick(preference)
-		}
-	}
-
-	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-		when (requestCode) {
-			REQUEST_RINGTONE -> {
-				if (resultCode == Activity.RESULT_OK) {
-					val uri =
-						data?.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+				registerForActivityResult(RingtonePickContract(preference.title.toString())) { uri ->
 					settings.notificationSound = uri?.toString().orEmpty()
 					findPreference<Preference>(R.string.key_notifications_sound)?.run {
 						summary = RingtoneManager.getRingtone(context, uri).getTitle(context)
 					}
-				}
-			}
-			else -> {
-				super.onActivityResult(requestCode, resultCode, data)
+				}.launch(settings.notificationSound.toUriOrNull())
+				true
 			}
+			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
-
-	private companion object {
-
-		const val REQUEST_RINGTONE = 340
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/utils/RingtonePickContract.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/utils/RingtonePickContract.kt
new file mode 100644
index 000000000..8d5b0d04f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/utils/RingtonePickContract.kt
@@ -0,0 +1,34 @@
+package org.koitharu.kotatsu.ui.settings.utils
+
+import android.content.Context
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import android.provider.Settings
+import androidx.activity.result.contract.ActivityResultContract
+
+class RingtonePickContract(private val title: String?) : ActivityResultContract<Uri?, Uri?>() {
+
+	override fun createIntent(context: Context, input: Uri?): Intent {
+		val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
+		intent.putExtra(
+			RingtoneManager.EXTRA_RINGTONE_TYPE,
+			RingtoneManager.TYPE_NOTIFICATION
+		)
+		intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
+		intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
+		intent.putExtra(
+			RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
+			Settings.System.DEFAULT_NOTIFICATION_URI
+		)
+		if (title != null) {
+			intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, title)
+		}
+		intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, input)
+		return intent
+	}
+
+	override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
+		return intent?.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt
index 78d6947f3..12e775ac5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.view.View
 import kotlinx.android.synthetic.main.activity_crash.*
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.ui.main.MainActivity
+import org.koitharu.kotatsu.ui.list.MainActivity
 
 class CrashActivity : Activity(), View.OnClickListener {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/widget/shelf/ShelfConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/widget/shelf/ShelfConfigActivity.kt
index f633021b8..a8cbb1eea 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/widget/shelf/ShelfConfigActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/widget/shelf/ShelfConfigActivity.kt
@@ -20,8 +20,8 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
 import org.koitharu.kotatsu.ui.common.BaseActivity
 import org.koitharu.kotatsu.ui.common.list.OnRecyclerItemClickListener
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesPresenter
-import org.koitharu.kotatsu.ui.main.list.favourites.categories.FavouriteCategoriesView
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesPresenter
+import org.koitharu.kotatsu.ui.list.favourites.categories.FavouriteCategoriesView
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import java.util.*
 import kotlin.collections.ArrayList
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1026b6965..e561b7c91 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.main.MainActivity"
+    tools:context=".ui.list.MainActivity"
     tools:openDrawer="start">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout