diff --git a/app/src/main/java/com/pomo/myapplication/MainActivity.kt b/app/src/main/java/com/pomo/myapplication/MainActivity.kt
index 1d2b52149a2f4d554071e640349054924f4e3871..ca137eb2485d1e4ba2c4f06a03f4599972b5bffe 100644
--- a/app/src/main/java/com/pomo/myapplication/MainActivity.kt
+++ b/app/src/main/java/com/pomo/myapplication/MainActivity.kt
@@ -15,6 +15,9 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.pomo.myapplication.timer.TimerScreen
+import com.pomo.myapplication.todo.TaskViewModel
+import com.pomo.myapplication.todo.ToDoScreen
 import com.pomo.myapplication.ui.theme.MyApplicationTheme
 
 class MainActivity : ComponentActivity() {
@@ -31,11 +34,10 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // Initialize helpers
+        // Initialisere Notification- und PermissionHelper
         notificationHelper = NotificationHelper(this)
         permissionsHelper = PermissionsHelper(this)
 
-        // Register individual permission launchers and pass them to PermissionsHelper
         val postNotificationLauncher =
             registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
                 permissionsHelper.handlePermissionResult(
@@ -60,7 +62,7 @@ class MainActivity : ComponentActivity() {
                 )
             }
 
-        // Initialize permission launchers with the registered launchers
+        // Initialisiere permission launchers mit Launcher
         permissionsHelper.initializePermissionLaunchers(
             postNotificationLauncher = postNotificationLauncher,
             accessNotificationPolicyLauncher = accessNotificationPolicyLauncher,
@@ -88,7 +90,7 @@ class MainActivity : ComponentActivity() {
     @Composable
     fun SetupNavGraph(navController: NavHostController) {
         // ViewModel einmalig für beide Screens
-        val taskViewModel: TaskViewModel = viewModel()  // Verwende viewModel() hier
+        val taskViewModel: TaskViewModel = viewModel()
 
         NavHost(
             navController = navController,
@@ -103,14 +105,14 @@ class MainActivity : ComponentActivity() {
                     },
                     notificationHelper = notificationHelper,
                     activity = this@MainActivity,
-                    viewModel = viewModel()  // ViewModel bereitstellen
+                    viewModel = viewModel()
                 )
             }
             composable("todo_screen") {
                 // Übergib den ViewModel an die ToDoScreen
                 ToDoScreen(
                     onBackClick = { navController.navigateUp() },
-                    taskViewModel = taskViewModel // ViewModel weitergeben
+                    taskViewModel = taskViewModel
                 )
             }
         }
diff --git a/app/src/main/java/com/pomo/myapplication/CustomTimerDialog.kt b/app/src/main/java/com/pomo/myapplication/timer/CustomTimerDialog.kt
similarity index 98%
rename from app/src/main/java/com/pomo/myapplication/CustomTimerDialog.kt
rename to app/src/main/java/com/pomo/myapplication/timer/CustomTimerDialog.kt
index 280494a69054ddcd3e78633bd1d171e10b1c87d8..67114e894c4ff87b12655fe7b3143da54db39afb 100644
--- a/app/src/main/java/com/pomo/myapplication/CustomTimerDialog.kt
+++ b/app/src/main/java/com/pomo/myapplication/timer/CustomTimerDialog.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.timer
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/pomo/myapplication/TimerScreen.kt b/app/src/main/java/com/pomo/myapplication/timer/TimerScreen.kt
similarity index 97%
rename from app/src/main/java/com/pomo/myapplication/TimerScreen.kt
rename to app/src/main/java/com/pomo/myapplication/timer/TimerScreen.kt
index 4a5633b57d0388606902849796e11f624cb9119e..0b2c2b6612c3a41cf52490cd491fb7376dd5d70e 100644
--- a/app/src/main/java/com/pomo/myapplication/TimerScreen.kt
+++ b/app/src/main/java/com/pomo/myapplication/timer/TimerScreen.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.timer
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Arrangement
@@ -27,6 +27,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import com.pomo.myapplication.MainActivity
+import com.pomo.myapplication.NotificationHelper
 
 @SuppressLint("DefaultLocale")
 @Composable
diff --git a/app/src/main/java/com/pomo/myapplication/ViewModel.kt b/app/src/main/java/com/pomo/myapplication/timer/ViewModel.kt
similarity index 96%
rename from app/src/main/java/com/pomo/myapplication/ViewModel.kt
rename to app/src/main/java/com/pomo/myapplication/timer/ViewModel.kt
index 6bc29c1da78e1c0cdf151aa6ade9ddbf6814a628..3f4026d314c039a756c44a726edbaa91bd9e3899 100644
--- a/app/src/main/java/com/pomo/myapplication/ViewModel.kt
+++ b/app/src/main/java/com/pomo/myapplication/timer/ViewModel.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.timer
 
 import android.Manifest
 import android.app.Application
@@ -9,6 +9,8 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.pomo.myapplication.MainActivity
+import com.pomo.myapplication.NotificationHelper
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/pomo/myapplication/TaskRepos.kt b/app/src/main/java/com/pomo/myapplication/todo/TaskRepos.kt
similarity index 93%
rename from app/src/main/java/com/pomo/myapplication/TaskRepos.kt
rename to app/src/main/java/com/pomo/myapplication/todo/TaskRepos.kt
index ef0861226e0b09aa2607a63026ede1127f352d9f..5ac69ff734833bb3257f5ef63e62903168acd58f 100644
--- a/app/src/main/java/com/pomo/myapplication/TaskRepos.kt
+++ b/app/src/main/java/com/pomo/myapplication/todo/TaskRepos.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.todo
 
 import com.pomo.myapplication.timerroom.TaskDao
 import com.pomo.myapplication.timerroom.TaskEntity
diff --git a/app/src/main/java/com/pomo/myapplication/TaskViewModel.kt b/app/src/main/java/com/pomo/myapplication/todo/TaskViewModel.kt
similarity index 96%
rename from app/src/main/java/com/pomo/myapplication/TaskViewModel.kt
rename to app/src/main/java/com/pomo/myapplication/todo/TaskViewModel.kt
index 36eb9441b8aee6c793e98f8e78c6dfb03f3c5192..e45b32982aa23768620418d3d0a198b1f2339e6e 100644
--- a/app/src/main/java/com/pomo/myapplication/TaskViewModel.kt
+++ b/app/src/main/java/com/pomo/myapplication/todo/TaskViewModel.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.todo
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
diff --git a/app/src/main/java/com/pomo/myapplication/ToDoList.kt b/app/src/main/java/com/pomo/myapplication/todo/ToDoList.kt
similarity index 99%
rename from app/src/main/java/com/pomo/myapplication/ToDoList.kt
rename to app/src/main/java/com/pomo/myapplication/todo/ToDoList.kt
index dbe4949e856902359c02a3c92250197f9d84963a..103b8d8b23d537e6ae8d9dd97fed00b7a9b35da7 100644
--- a/app/src/main/java/com/pomo/myapplication/ToDoList.kt
+++ b/app/src/main/java/com/pomo/myapplication/todo/ToDoList.kt
@@ -1,4 +1,4 @@
-package com.pomo.myapplication
+package com.pomo.myapplication.todo
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
diff --git a/app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt b/app/src/main/java/com/pomo/myapplication/ui/theme/Colors.kt
similarity index 100%
rename from app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt
rename to app/src/main/java/com/pomo/myapplication/ui/theme/Colors.kt