diff --git a/app/src/main/java/org/mosad/teapod/MainActivity.kt b/app/src/main/java/org/mosad/teapod/MainActivity.kt
index 4372626..e8ec4f8 100644
--- a/app/src/main/java/org/mosad/teapod/MainActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/MainActivity.kt
@@ -35,13 +35,13 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.mosad.teapod.parser.AoDParser
 import org.mosad.teapod.preferences.EncryptedPreferences
-import org.mosad.teapod.ui.MediaFragment
-import org.mosad.teapod.ui.account.AccountFragment
+import org.mosad.teapod.ui.fragments.MediaFragment
+import org.mosad.teapod.ui.fragments.AccountFragment
 import org.mosad.teapod.ui.components.LoginDialog
-import org.mosad.teapod.ui.home.HomeFragment
-import org.mosad.teapod.ui.library.LibraryFragment
-import org.mosad.teapod.ui.search.SearchFragment
-import org.mosad.teapod.util.LoadingFragment
+import org.mosad.teapod.ui.fragments.HomeFragment
+import org.mosad.teapod.ui.fragments.LibraryFragment
+import org.mosad.teapod.ui.fragments.SearchFragment
+import org.mosad.teapod.ui.fragments.LoadingFragment
 import org.mosad.teapod.util.Media
 import org.mosad.teapod.util.TMDBApiController
 import kotlin.system.measureTimeMillis
diff --git a/app/src/main/java/org/mosad/teapod/ui/account/AccountFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
similarity index 98%
rename from app/src/main/java/org/mosad/teapod/ui/account/AccountFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
index 83abe09..8441302 100644
--- a/app/src/main/java/org/mosad/teapod/ui/account/AccountFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.ui.account
+package org.mosad.teapod.ui.fragments
 
 import android.os.Bundle
 import android.util.Log
diff --git a/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
similarity index 94%
rename from app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
index 1aa3936..d0fb92d 100644
--- a/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.ui.home
+package org.mosad.teapod.ui.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
similarity index 97%
rename from app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
index 27c281f..dc9b8b4 100644
--- a/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.ui.library
+package org.mosad.teapod.ui.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mosad/teapod/util/LoadingFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/LoadingFragment.kt
similarity index 91%
rename from app/src/main/java/org/mosad/teapod/util/LoadingFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/LoadingFragment.kt
index 00a3473..87536a5 100644
--- a/app/src/main/java/org/mosad/teapod/util/LoadingFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/LoadingFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.util
+package org.mosad.teapod.ui.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/MediaFragment.kt
similarity index 99%
rename from app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/MediaFragment.kt
index 169139e..c74d4f2 100644
--- a/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/MediaFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.ui
+package org.mosad.teapod.ui.fragments
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
diff --git a/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
similarity index 98%
rename from app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt
rename to app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
index 0fa956f..9168772 100644
--- a/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.teapod.ui.search
+package org.mosad.teapod.ui.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index d633aa1..fc6102c 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f5f5f5"
-    tools:context=".ui.account.AccountFragment">
+    tools:context=".ui.fragments.AccountFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7948aea..82694a4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f5f5f5"
-    tools:context=".ui.home.HomeFragment">
+    tools:context=".ui.fragments.HomeFragment">
 
     <TextView
         android:id="@+id/text_home"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 55fc031..ac609b5 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f5f5f5"
-    tools:context=".ui.library.LibraryFragment">
+    tools:context=".ui.fragments.LibraryFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_media_library"
diff --git a/app/src/main/res/layout/fragment_media.xml b/app/src/main/res/layout/fragment_media.xml
index 40f6e9d..88c3dee 100644
--- a/app/src/main/res/layout/fragment_media.xml
+++ b/app/src/main/res/layout/fragment_media.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f5f5f5"
-    tools:context=".ui.MediaFragment">
+    tools:context=".ui.fragments.MediaFragment">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index d3948a6..af3348f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f5f5f5"
-    tools:context=".ui.search.SearchFragment">
+    tools:context=".ui.fragments.SearchFragment">
 
     <SearchView
         android:id="@+id/search_text"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index eced0dc..ca6b6fe 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,25 +7,25 @@
 
     <fragment
         android:id="@+id/navigation_home"
-        android:name="org.mosad.teapod.ui.home.HomeFragment"
+        android:name="org.mosad.teapod.ui.fragments.HomeFragment"
         android:label="@string/title_home"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/navigation_library"
-        android:name="org.mosad.teapod.ui.library.LibraryFragment"
+        android:name="org.mosad.teapod.ui.fragments.LibraryFragment"
         android:label="@string/title_library"
         tools:layout="@layout/fragment_library" />
 
     <fragment
         android:id="@+id/navigation_search"
-        android:name="org.mosad.teapod.ui.search.SearchFragment"
+        android:name="org.mosad.teapod.ui.fragments.SearchFragment"
         android:label="@string/title_search"
         tools:layout="@layout/fragment_search" />
 
     <fragment
         android:id="@+id/navigation_account"
-        android:name="org.mosad.teapod.ui.account.AccountFragment"
+        android:name="org.mosad.teapod.ui.fragments.AccountFragment"
         android:label="@string/title_account"
         tools:layout="@layout/fragment_account" />