diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ceaf3f..2615c25 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.AndroidEngineerCodeCheck"
         android:fullBackupContent="@xml/backup_descriptor">
         <activity
-            android:name="jp.co.yumemi.android.code_check.MainActivity"
+            android:name="jp.co.yumemi.android.code_check.presentation.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/MainActivity.kt
similarity index 87%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/MainActivity.kt
index 58d7058..b8b07ba 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/MainActivity.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation
 
 import androidx.appcompat.app.AppCompatActivity
 import java.util.*
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DetailFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/detail/DetailFragment.kt
similarity index 89%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/DetailFragment.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/detail/DetailFragment.kt
index 0daf650..0eeb661 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/DetailFragment.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/detail/DetailFragment.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.detail
 
 import android.os.Bundle
 import android.util.Log
@@ -9,7 +9,8 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import coil.load
-import jp.co.yumemi.android.code_check.MainActivity.Companion.lastSearchDate
+import jp.co.yumemi.android.code_check.presentation.MainActivity.Companion.lastSearchDate
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.databinding.FragmentDetailBinding
 import jp.co.yumemi.android.code_check.models.Repository
 
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragment.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragment.kt
similarity index 93%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragment.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragment.kt
index 82ce7c9..1e43da1 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragment.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragment.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.os.Bundle
 import android.view.View
@@ -12,11 +12,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.*
-import jp.co.yumemi.android.code_check.MainActivity.Companion.updateLastSearchDate
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.data.GitHubAPI
 import jp.co.yumemi.android.code_check.data.repository.GitHubRepositoryImpl
 import jp.co.yumemi.android.code_check.databinding.FragmentMainBinding
 import jp.co.yumemi.android.code_check.models.Repository
+import jp.co.yumemi.android.code_check.presentation.MainActivity.Companion.updateLastSearchDate
 import kotlinx.coroutines.launch
 
 /**
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragmentAdapter.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragmentAdapter.kt
similarity index 92%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragmentAdapter.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragmentAdapter.kt
index 6a58231..59ed618 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainFragmentAdapter.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainFragmentAdapter.kt
@@ -1,4 +1,4 @@
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.view.LayoutInflater
 import android.view.View
@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.models.Repository
 import jp.co.yumemi.android.code_check.util.diff_util
 
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainUiState.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainUiState.kt
similarity index 80%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/MainUiState.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainUiState.kt
index 5505c7f..d7f1508 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainUiState.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainUiState.kt
@@ -1,4 +1,4 @@
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import jp.co.yumemi.android.code_check.models.Repository
 
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainViewModel.kt
similarity index 96%
rename from app/src/main/kotlin/jp/co/yumemi/android/code_check/MainViewModel.kt
rename to app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainViewModel.kt
index fa8cf08..e7c1b43 100644
--- a/app/src/main/kotlin/jp/co/yumemi/android/code_check/MainViewModel.kt
+++ b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainViewModel.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2021 YUMEMI Inc. All rights reserved.
  */
-package jp.co.yumemi.android.code_check
+package jp.co.yumemi.android.code_check.presentation.main
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8acc72b..d8d149e 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.MainActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index ed3c916..d270c70 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_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.MainActivity">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/searchBar"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 2adf953..006dd77 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/mainFragment"
-        android:name="jp.co.yumemi.android.code_check.MainFragment"
+        android:name="jp.co.yumemi.android.code_check.presentation.main.MainFragment"
         android:label="@string/app_name"
         tools:layout="@layout/fragment_main">
         <action
@@ -17,7 +17,7 @@
 
     <fragment
         android:id="@+id/detailFragment"
-        android:name="jp.co.yumemi.android.code_check.DetailFragment"
+        android:name="jp.co.yumemi.android.code_check.presentation.detail.DetailFragment"
         android:label="@string/app_name"
         tools:layout="@layout/fragment_detail">
         <argument