diff --git a/testomania/src/main/java/com/earth/testomania/MainActivity.kt b/testomania/src/main/java/com/earth/testomania/MainActivity.kt
index 356767d0..42b62b06 100644
--- a/testomania/src/main/java/com/earth/testomania/MainActivity.kt
+++ b/testomania/src/main/java/com/earth/testomania/MainActivity.kt
@@ -7,15 +7,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.earth.testomania.technical.presentation.QuizViewModel
-import com.earth.testomania.ui.theme.TestomaniaTheme
 import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.earth.testomania.presentation.NavGraphs
 import com.earth.testomania.presentation.TopBar
+import com.earth.testomania.technical.presentation.QuizViewModel
 import com.earth.testomania.ui.theme.TestomaniaTheme
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.rememberNavHostEngine
diff --git a/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt b/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt
index 806756d4..9cd2eb0a 100644
--- a/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt
+++ b/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt
@@ -6,11 +6,11 @@ import androidx.compose.material.Button
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.earth.testomania.R
-import com.earth.testomania.presentation.destinations.SkillzTestScreenDestination
+import com.earth.testomania.destinations.SkillzTestScreenDestination
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
diff --git a/testomania/src/main/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepo.kt b/testomania/src/main/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepo.kt
similarity index 90%
rename from testomania/src/main/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepo.kt
rename to testomania/src/main/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepo.kt
index 78113b41..8e99d018 100644
--- a/testomania/src/main/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepo.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepo.kt
@@ -1,8 +1,8 @@
-package com.earth.testomania.skills
+package com.earth.testomania.skills.data
 
 import android.content.Context
 import com.earth.testomania.R
-import com.earth.testomania.skills.dto.GeneralTestItemDTO
+import com.earth.testomania.skills.data.dto.GeneralTestItemDTO
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
diff --git a/testomania/src/main/java/com/earth/testomania/skills/dto/GeneralTestItemDTO.kt b/testomania/src/main/java/com/earth/testomania/skills/data/dto/GeneralTestItemDTO.kt
similarity index 89%
rename from testomania/src/main/java/com/earth/testomania/skills/dto/GeneralTestItemDTO.kt
rename to testomania/src/main/java/com/earth/testomania/skills/data/dto/GeneralTestItemDTO.kt
index 5711bb5f..cb3f1b87 100644
--- a/testomania/src/main/java/com/earth/testomania/skills/dto/GeneralTestItemDTO.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/data/dto/GeneralTestItemDTO.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills.dto
+package com.earth.testomania.skills.data.dto
 
 import com.squareup.moshi.JsonClass
 
diff --git a/testomania/src/main/java/com/earth/testomania/skills/dto/OptionDTO.kt b/testomania/src/main/java/com/earth/testomania/skills/data/dto/OptionDTO.kt
similarity index 83%
rename from testomania/src/main/java/com/earth/testomania/skills/dto/OptionDTO.kt
rename to testomania/src/main/java/com/earth/testomania/skills/data/dto/OptionDTO.kt
index a84d2668..a53675cd 100644
--- a/testomania/src/main/java/com/earth/testomania/skills/dto/OptionDTO.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/data/dto/OptionDTO.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills.dto
+package com.earth.testomania.skills.data.dto
 
 import com.squareup.moshi.JsonClass
 
diff --git a/testomania/src/main/java/com/earth/testomania/domain/GetAllSkillsTestsUseCase.kt b/testomania/src/main/java/com/earth/testomania/skills/domain/GetAllSkillsTestsUseCase.kt
similarity index 85%
rename from testomania/src/main/java/com/earth/testomania/domain/GetAllSkillsTestsUseCase.kt
rename to testomania/src/main/java/com/earth/testomania/skills/domain/GetAllSkillsTestsUseCase.kt
index bec013d1..82efa764 100644
--- a/testomania/src/main/java/com/earth/testomania/domain/GetAllSkillsTestsUseCase.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/domain/GetAllSkillsTestsUseCase.kt
@@ -1,8 +1,8 @@
-package com.earth.testomania.domain
+package com.earth.testomania.skills.domain
 
 import com.earth.testomania.domain.models.GeneralMathematicalSkillsTest
 import com.earth.testomania.domain.models.PossibleAnswer
-import com.earth.testomania.skills.GeneralSkillsMathematicalRepo
+import com.earth.testomania.skills.data.GeneralSkillsMathematicalRepo
 import javax.inject.Inject
 
 class GetAllSkillsTestsUseCase @Inject constructor(
diff --git a/testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsScreen.kt b/testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsScreen.kt
similarity index 95%
rename from testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsScreen.kt
rename to testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsScreen.kt
index 93d2122b..d8fc6152 100644
--- a/testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsScreen.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsScreen.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.presentation.skillz
+package com.earth.testomania.skills.presentation.skillz
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Column
diff --git a/testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsViewModel.kt b/testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsViewModel.kt
similarity index 87%
rename from testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsViewModel.kt
rename to testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsViewModel.kt
index 0c6e0a48..5ca6fc06 100644
--- a/testomania/src/main/java/com/earth/testomania/presentation/skillz/SkillzTestsViewModel.kt
+++ b/testomania/src/main/java/com/earth/testomania/skills/presentation/skillz/SkillzTestsViewModel.kt
@@ -1,9 +1,9 @@
-package com.earth.testomania.presentation.skillz
+package com.earth.testomania.skills.presentation.skillz
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.earth.testomania.domain.GetAllSkillsTestsUseCase
 import com.earth.testomania.domain.models.GeneralMathematicalSkillsTest
+import com.earth.testomania.skills.domain.GetAllSkillsTestsUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/testomania/src/test/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepoTest.kt b/testomania/src/test/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepoTest.kt
similarity index 95%
rename from testomania/src/test/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepoTest.kt
rename to testomania/src/test/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepoTest.kt
index 023e516c..2c8acc65 100644
--- a/testomania/src/test/java/com/earth/testomania/skills/GeneralSkillsMathematicalRepoTest.kt
+++ b/testomania/src/test/java/com/earth/testomania/skills/data/GeneralSkillsMathematicalRepoTest.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills
+package com.earth.testomania.skills.data
 
 import com.google.common.truth.Truth
 import dagger.hilt.android.testing.HiltAndroidRule