42 files changed, 83 insertions, 61 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 0251555..d28b3c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4de763c..93413a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,23 +14,23 @@
         android:theme="@style/Theme.Aniki"
         tools:ignore="AllowBackup">
         <activity
-            android:name="xyz.adjutor.aniki.manga.topmanga.DetailTopMangaActivity"
+            android:name="xyz.adjutor.aniki.presentation.view.DetailTopMangaActivity"
             android:label="Details"
             android:theme="@style/Theme.Aniki" />
         <activity
-            android:name="xyz.adjutor.aniki.anime.topanime.DetailTopAnimeActivity"
+            android:name="xyz.adjutor.aniki.presentation.view.DetailTopAnimeActivity"
             android:label="Details"
             android:theme="@style/Theme.Aniki" />
         <activity
-            android:name="xyz.adjutor.aniki.manga.search.DetailSearchMangaActivity"
+            android:name="xyz.adjutor.aniki.presentation.view.DetailSearchMangaActivity"
             android:label="Details"
             android:theme="@style/Theme.Aniki" />
         <activity
-            android:name="xyz.adjutor.aniki.anime.search.DetailSearchAnimeActivity"
+            android:name="xyz.adjutor.aniki.presentation.view.DetailSearchAnimeActivity"
             android:label="Details"
             android:theme="@style/Theme.Aniki" />
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.view.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.Aniki.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/AnimeApi.kt
index 52ca2ba..d67d0ef 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/AnimeApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.anime
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
+import xyz.adjutor.aniki.presentation.model.AnimeResponse
 
 interface AnimeApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/MangaApi.kt
index f1b51a4..699efa4 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/MangaApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.manga
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
+import xyz.adjutor.aniki.presentation.model.MangaResponse
 
 interface MangaApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/SearchAnimeApi.kt
index 5512636..1b0811b 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/SearchAnimeApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
+import xyz.adjutor.aniki.presentation.model.SearchAnimeResponse
 
 interface SearchAnimeApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/SearchMangaApi.kt
index 6f3e63d..3b26c1a 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/SearchMangaApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
+import xyz.adjutor.aniki.presentation.model.SearchMangaResponse
 
 interface SearchMangaApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/TopAnimeApi.kt
index 2e6b1e0..39bd78b 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/TopAnimeApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
+import xyz.adjutor.aniki.presentation.model.TopAnimeResponse
 
 interface TopAnimeApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/TopMangaApi.kt
index 2688fab..8edab88 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaApi.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/data/TopMangaApi.kt
@@ -1,8 +1,9 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.data
 
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
+import xyz.adjutor.aniki.presentation.model.TopMangaResponse
 
 interface TopMangaApi {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/AnimeResponse.kt
index 9e279e1..d682e3c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/AnimeResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/MangaResponse.kt
index 263b93c..4bd7f2f 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/MangaResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnime.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchAnime.kt
index ad7b7eb..df5189d 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnime.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchAnime.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchAnimeResponse.kt
index 92100ba..1e20e2f 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchAnimeResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchManga.kt
index 518a0a6..c24d93c 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchManga.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchManga.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchMangaResponse.kt
index 7721258..4fe7047 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/SearchMangaResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnime.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopAnime.kt
index 5202227..3cf4390 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnime.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopAnime.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopAnimeResponse.kt
index 2fe69d6..95d39d6 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopAnimeResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopManga.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopManga.kt
index 2ceceea..2e0886a 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopManga.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopManga.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopMangaResponse.kt
index 8577050..1b0dd8f 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaResponse.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/TopMangaResponse.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.presentation.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailSearchAnimeActivity.kt
index 2f4a6c2..68a30de 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/DetailSearchAnimeActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailSearchAnimeActivity.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.os.Bundle
 import android.widget.ImageView
@@ -14,8 +14,8 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.anime.AnimeApi
-import xyz.adjutor.aniki.anime.AnimeResponse
+import xyz.adjutor.aniki.data.AnimeApi
+import xyz.adjutor.aniki.presentation.model.AnimeResponse
 
 class DetailSearchAnimeActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailSearchMangaActivity.kt
index 4ae01f8..d96cc70 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/DetailSearchMangaActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailSearchMangaActivity.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.os.Bundle
 import android.widget.ImageView
@@ -14,8 +14,8 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.manga.MangaApi
-import xyz.adjutor.aniki.manga.MangaResponse
+import xyz.adjutor.aniki.data.MangaApi
+import xyz.adjutor.aniki.presentation.model.MangaResponse
 
 class DetailSearchMangaActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/DetailTopAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailTopAnimeActivity.kt
index 661937f..3ec6ab6 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/DetailTopAnimeActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailTopAnimeActivity.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -17,8 +17,8 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.anime.AnimeApi
-import xyz.adjutor.aniki.anime.AnimeResponse
+import xyz.adjutor.aniki.data.AnimeApi
+import xyz.adjutor.aniki.presentation.model.AnimeResponse
 import java.lang.reflect.Type
 
 class DetailTopAnimeActivity : AppCompatActivity() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailTopMangaActivity.kt
index 6d89437..0142018 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/DetailTopMangaActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/DetailTopMangaActivity.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -17,8 +17,8 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
-import xyz.adjutor.aniki.manga.MangaApi
-import xyz.adjutor.aniki.manga.MangaResponse
+import xyz.adjutor.aniki.data.MangaApi
+import xyz.adjutor.aniki.presentation.model.MangaResponse
 import java.lang.reflect.Type
 
 class DetailTopMangaActivity : AppCompatActivity() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt
index 46dac33..f2abca1 100644
--- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki
+package xyz.adjutor.aniki.presentation.view
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import xyz.adjutor.aniki.R
 
 class HomePage : Fragment() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/MainActivity.kt
index ddc054f..bff89e4 100644
--- a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/MainActivity.kt
@@ -1,7 +1,8 @@
-package xyz.adjutor.aniki
+package xyz.adjutor.aniki.presentation.view
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import xyz.adjutor.aniki.R
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchAnimeAdapter.kt
index 78718dd..e938473 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimeAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchAnimeAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.presentation.model.SearchAnime
 
 class SearchAnimeAdapter(private val animeList: List<SearchAnime>) :
     RecyclerView.Adapter<SearchAnimeAdapter.AnimeViewHolder>() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchAnimePage.kt
index b624069..d2cf795 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/search/SearchAnimePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchAnimePage.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.os.Bundle
@@ -22,8 +22,10 @@ import retrofit2.Callback
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import xyz.adjutor.aniki.MainActivity
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.data.SearchAnimeApi
+import xyz.adjutor.aniki.presentation.model.SearchAnime
+import xyz.adjutor.aniki.presentation.model.SearchAnimeResponse
 
 class SearchAnimePage : Fragment() {
 
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchMangaAdapter.kt
index fb95c9c..061eafc 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchMangaAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.presentation.model.SearchManga
 
 class SearchMangaAdapter(private val mangaList: List<SearchManga>) :
     RecyclerView.Adapter<SearchMangaAdapter.MangaViewHolder>() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchMangaPage.kt
index d236887..7d7fa74 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/search/SearchMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/SearchMangaPage.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.search
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.os.Bundle
@@ -22,8 +22,10 @@ import retrofit2.Callback
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import xyz.adjutor.aniki.MainActivity
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.data.SearchMangaApi
+import xyz.adjutor.aniki.presentation.model.SearchManga
+import xyz.adjutor.aniki.presentation.model.SearchMangaResponse
 
 
 class SearchMangaPage : Fragment() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopAnimeAdapter.kt
index fa1b5ed..b1b336a 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimeAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopAnimeAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.presentation.model.TopAnime
 
 class TopAnimeAdapter(private val animeList: List<TopAnime>) :
     RecyclerView.Adapter<TopAnimeAdapter.AnimeViewHolder>() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopAnimePage.kt
index babb7c1..8a7ef08 100644
--- a/app/src/main/java/xyz/adjutor/aniki/anime/topanime/TopAnimePage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopAnimePage.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.anime.topanime
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -22,6 +22,9 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.data.TopAnimeApi
+import xyz.adjutor.aniki.presentation.model.TopAnime
+import xyz.adjutor.aniki.presentation.model.TopAnimeResponse
 import java.lang.reflect.Type
 
 class TopAnimePage : Fragment() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopMangaAdapter.kt
index d0c56f7..fac3730 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaAdapter.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopMangaAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.presentation.model.TopManga
 
 class TopMangaAdapter(private val mangaList: List<TopManga>) :
     RecyclerView.Adapter<TopMangaAdapter.MangaViewHolder>() {
diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopMangaPage.kt
index 9c138a3..2bf84e8 100644
--- a/app/src/main/java/xyz/adjutor/aniki/manga/topmanga/TopMangaPage.kt
+++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/TopMangaPage.kt
@@ -1,4 +1,4 @@
-package xyz.adjutor.aniki.manga.topmanga
+package xyz.adjutor.aniki.presentation.view
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -22,6 +22,9 @@ import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import xyz.adjutor.aniki.R
+import xyz.adjutor.aniki.data.TopMangaApi
+import xyz.adjutor.aniki.presentation.model.TopManga
+import xyz.adjutor.aniki.presentation.model.TopMangaResponse
 import java.lang.reflect.Type
 
 class TopMangaPage : Fragment() {
diff --git a/app/src/main/res/layout/activity_detail_top_anime.xml b/app/src/main/res/layout/activity_detail_top_anime.xml
index c9f5316..d4c9380 100644
--- a/app/src/main/res/layout/activity_detail_top_anime.xml
+++ b/app/src/main/res/layout/activity_detail_top_anime.xml
@@ -8,7 +8,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context=".anime.topanime.DetailTopAnimeActivity">
+        tools:context=".presentation.view.DetailTopAnimeActivity">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cv_header"
diff --git a/app/src/main/res/layout/activity_detail_top_manga.xml b/app/src/main/res/layout/activity_detail_top_manga.xml
index 2e29c0e..e659baf 100644
--- a/app/src/main/res/layout/activity_detail_top_manga.xml
+++ b/app/src/main/res/layout/activity_detail_top_manga.xml
@@ -8,7 +8,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context=".manga.topmanga.DetailTopMangaActivity">
+        tools:context=".presentation.view.DetailTopMangaActivity">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cv_header"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a975f22..ff9ab1f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.view.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml
index be80747..1c547d6 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/very_dark_purple"
-    tools:context=".HomePage">
+    tools:context=".presentation.view.HomePage">
 
     <TextView
         android:id="@+id/tv_title"
diff --git a/app/src/main/res/layout/search_anime_page.xml b/app/src/main/res/layout/search_anime_page.xml
index f91c1d9..a3a1671 100644
--- a/app/src/main/res/layout/search_anime_page.xml
+++ b/app/src/main/res/layout/search_anime_page.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/very_dark_purple"
-    tools:context=".anime.search.SearchAnimePage">
+    tools:context=".presentation.view.SearchAnimePage">
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/tiet_query"
diff --git a/app/src/main/res/layout/search_manga_page.xml b/app/src/main/res/layout/search_manga_page.xml
index cacab1d..a83b4ef 100644
--- a/app/src/main/res/layout/search_manga_page.xml
+++ b/app/src/main/res/layout/search_manga_page.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/very_dark_purple"
-    tools:context=".manga.search.SearchMangaPage">
+    tools:context=".presentation.view.SearchMangaPage">
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/tiet_query"
diff --git a/app/src/main/res/layout/top_anime_page.xml b/app/src/main/res/layout/top_anime_page.xml
index 6797660..7b33f34 100644
--- a/app/src/main/res/layout/top_anime_page.xml
+++ b/app/src/main/res/layout/top_anime_page.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/very_dark_purple"
-    tools:context=".anime.topanime.TopAnimePage">
+    tools:context=".presentation.view.TopAnimePage">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swiperefresh"
diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml
index 2f4a9f1..e3bbd47 100644
--- a/app/src/main/res/layout/top_manga_page.xml
+++ b/app/src/main/res/layout/top_manga_page.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/very_dark_purple"
-    tools:context=".manga.topmanga.TopMangaPage">
+    tools:context=".presentation.view.TopMangaPage">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swiperefresh"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 89cbc89..95c7996 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/HomePage"
-        android:name="xyz.adjutor.aniki.HomePage"
+        android:name="xyz.adjutor.aniki.presentation.view.HomePage"
         android:label="@string/home_page_label"
         tools:layout="@layout/home_page">
 
@@ -28,7 +28,7 @@
 
     <fragment
         android:id="@+id/TopMangaPage"
-        android:name="xyz.adjutor.aniki.manga.topmanga.TopMangaPage"
+        android:name="xyz.adjutor.aniki.presentation.view.TopMangaPage"
         android:label="@string/top_manga_page_label"
         tools:layout="@layout/top_manga_page">
 
@@ -38,7 +38,7 @@
     </fragment>
     <fragment
         android:id="@+id/TopAnimePage"
-        android:name="xyz.adjutor.aniki.anime.topanime.TopAnimePage"
+        android:name="xyz.adjutor.aniki.presentation.view.TopAnimePage"
         android:label="@string/top_anime_page_label"
         tools:layout="@layout/top_anime_page">
 
@@ -48,7 +48,7 @@
     </fragment>
     <fragment
         android:id="@+id/SearchMangaPage"
-        android:name="xyz.adjutor.aniki.manga.search.SearchMangaPage"
+        android:name="xyz.adjutor.aniki.presentation.view.SearchMangaPage"
         android:label="@string/search_manga_page_label"
         tools:layout="@layout/search_manga_page">
 
@@ -58,7 +58,7 @@
     </fragment>
     <fragment
         android:id="@+id/SearchAnimePage"
-        android:name="xyz.adjutor.aniki.anime.search.SearchAnimePage"
+        android:name="xyz.adjutor.aniki.presentation.view.SearchAnimePage"
         android:label="@string/search_anime_page_label"
         tools:layout="@layout/search_anime_page">
 
diff --git a/build.gradle b/build.gradle
index ef7bd27..a33d7ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong