diff --git a/app/src/androidTest/java/com/sadellie/unitto/screen/SwapUnitsTest.kt b/app/src/androidTest/java/com/sadellie/unitto/screen/SwapUnitsTest.kt
index 4519e309..aa2cee3e 100644
--- a/app/src/androidTest/java/com/sadellie/unitto/screen/SwapUnitsTest.kt
+++ b/app/src/androidTest/java/com/sadellie/unitto/screen/SwapUnitsTest.kt
@@ -11,7 +11,7 @@ import com.sadellie.unitto.data.units.AllUnitsRepository
 import com.sadellie.unitto.data.units.MyUnitIDS
 import com.sadellie.unitto.data.units.database.MyBasedUnitDatabase
 import com.sadellie.unitto.data.units.database.MyBasedUnitsRepository
-import com.sadellie.unitto.screens.MainViewModel
+import com.sadellie.unitto.screens.main.MainViewModel
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
diff --git a/app/src/main/java/com/sadellie/unitto/MainActivity.kt b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
index 15c6aa2a..a134c600 100644
--- a/app/src/main/java/com/sadellie/unitto/MainActivity.kt
+++ b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
@@ -41,7 +41,7 @@ import com.sadellie.unitto.data.NavRoutes.SETTINGS_GRAPH
 import com.sadellie.unitto.data.NavRoutes.SETTINGS_SCREEN
 import com.sadellie.unitto.data.NavRoutes.THEMES_SCREEN
 import com.sadellie.unitto.data.NavRoutes.UNIT_GROUPS_SCREEN
-import com.sadellie.unitto.screens.MainViewModel
+import com.sadellie.unitto.screens.main.MainViewModel
 import com.sadellie.unitto.screens.main.MainScreen
 import com.sadellie.unitto.screens.second.LeftSideScreen
 import com.sadellie.unitto.screens.second.RightSideScreen
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
index 4bfbe90e..f3fd81bc 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
@@ -47,8 +47,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.sadellie.unitto.R
 import com.sadellie.unitto.data.NavRoutes.SETTINGS_SCREEN
 import com.sadellie.unitto.data.units.AbstractUnit
-import com.sadellie.unitto.screens.MainScreenUIState
-import com.sadellie.unitto.screens.MainViewModel
 import com.sadellie.unitto.screens.common.AnimatedTopBarText
 import com.sadellie.unitto.screens.main.components.Keyboard
 import com.sadellie.unitto.screens.main.components.TopScreenPart
diff --git a/app/src/main/java/com/sadellie/unitto/screens/MainScreenUIState.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreenUIState.kt
similarity index 97%
rename from app/src/main/java/com/sadellie/unitto/screens/MainScreenUIState.kt
rename to app/src/main/java/com/sadellie/unitto/screens/main/MainScreenUIState.kt
index d3cc2a98..1a28102c 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/MainScreenUIState.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreenUIState.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.screens
+package com.sadellie.unitto.screens.main
 
 import com.sadellie.unitto.data.KEY_0
 
diff --git a/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainViewModel.kt
similarity index 99%
rename from app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
rename to app/src/main/java/com/sadellie/unitto/screens/main/MainViewModel.kt
index 685c2e9e..fe3c14be 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainViewModel.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.screens
+package com.sadellie.unitto.screens.main
 
 import android.app.Application
 import android.util.Log