diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aada69ce..5b758421 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
 		<!-- TODO: add banner -->
 		<activity
 			android:theme="@style/Theme.Leanback"
-			android:name=".tv.MainActivity"
+			android:name=".tv.main.MainActivity"
 			android:exported="true"
 			android:screenOrientation="landscape">
 			<intent-filter>
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/tv/ChannelCardPresenter.kt b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/ChannelCardPresenter.kt
similarity index 96%
rename from app/src/main/java/de/christinecoenen/code/zapp/tv/ChannelCardPresenter.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/tv/main/ChannelCardPresenter.kt
index dbd0772f..37b40d47 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/tv/ChannelCardPresenter.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/ChannelCardPresenter.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.tv
+package de.christinecoenen.code.zapp.tv.main
 
 import android.graphics.drawable.InsetDrawable
 import android.view.ViewGroup
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/tv/MainActivity.kt b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainActivity.kt
similarity index 86%
rename from app/src/main/java/de/christinecoenen/code/zapp/tv/MainActivity.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainActivity.kt
index 95abcc9d..ff41245d 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/tv/MainActivity.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainActivity.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.tv
+package de.christinecoenen.code.zapp.tv.main
 
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/tv/MainFragment.kt b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainFragment.kt
similarity index 96%
rename from app/src/main/java/de/christinecoenen/code/zapp/tv/MainFragment.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainFragment.kt
index da3cda87..c883bcb9 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/tv/MainFragment.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/tv/main/MainFragment.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.tv
+package de.christinecoenen.code.zapp.tv.main
 
 import android.os.Bundle
 import androidx.leanback.app.VerticalGridSupportFragment
diff --git a/app/src/main/res/layout/tv_activity_main.xml b/app/src/main/res/layout/tv_activity_main.xml
index 75fbb297..a498c942 100644
--- a/app/src/main/res/layout/tv_activity_main.xml
+++ b/app/src/main/res/layout/tv_activity_main.xml
@@ -4,12 +4,12 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:context=".tv.MainActivity"
+	tools:context=".tv.main.MainActivity"
 	tools:deviceIds="tv">
 
 	<androidx.fragment.app.FragmentContainerView
 		android:id="@+id/pizza_grid_fragment"
-		android:name="de.christinecoenen.code.zapp.tv.MainFragment"
+		android:name="de.christinecoenen.code.zapp.tv.main.MainFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />