diff --git a/finlog_app/app/lib/app/router.dart b/finlog_app/app/lib/core/app/router.dart
similarity index 96%
rename from finlog_app/app/lib/app/router.dart
rename to finlog_app/app/lib/core/app/router.dart
index aeff236..00256ed 100644
--- a/finlog_app/app/lib/app/router.dart
+++ b/finlog_app/app/lib/core/app/router.dart
@@ -1,13 +1,12 @@
 import 'package:app/modules/app_shell.dart';
 import 'package:app/modules/budget/budget_view.dart';
+import 'package:app/modules/dashboard/dashboard_view.dart';
 import 'package:app/modules/login/pages/login_page.dart';
+import 'package:app/modules/settings/settings_view.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:animations/animations.dart';
 
-import '../modules/dashboard/dashboard_view.dart';
-import '../modules/settings/settings_view.dart';
-
 enum AppRoute {
   login('/login'),
   home('/home'),
diff --git a/finlog_app/app/lib/app/startup/domain/initialize_app.dart b/finlog_app/app/lib/core/app/startup/domain/initialize_app.dart
similarity index 86%
rename from finlog_app/app/lib/app/startup/domain/initialize_app.dart
rename to finlog_app/app/lib/core/app/startup/domain/initialize_app.dart
index 13f5666..53ab0a6 100644
--- a/finlog_app/app/lib/app/startup/domain/initialize_app.dart
+++ b/finlog_app/app/lib/core/app/startup/domain/initialize_app.dart
@@ -1,4 +1,4 @@
-import 'package:app/app/router.dart';
+import 'package:app/core/app/router.dart';
 
 class InitializeAppUseCase {
   Future<AppRoute> call() async {
diff --git a/finlog_app/app/lib/app/theme.dart b/finlog_app/app/lib/core/app/theme.dart
similarity index 100%
rename from finlog_app/app/lib/app/theme.dart
rename to finlog_app/app/lib/core/app/theme.dart
diff --git a/finlog_app/app/lib/main.dart b/finlog_app/app/lib/main.dart
index b9b6d88..18bb25d 100644
--- a/finlog_app/app/lib/main.dart
+++ b/finlog_app/app/lib/main.dart
@@ -1,6 +1,6 @@
-import 'package:app/app/router.dart';
-import 'package:app/app/startup/domain/initialize_app.dart';
-import 'package:app/app/theme.dart';
+import 'package:app/core/app/router.dart';
+import 'package:app/core/app/startup/domain/initialize_app.dart';
+import 'package:app/core/app/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttery/fluttery.dart';
 import 'package:fluttery/logger.dart';
diff --git a/finlog_app/app/lib/modules/login/pages/login_page.dart b/finlog_app/app/lib/modules/login/pages/login_page.dart
index 1b13ed1..53e4367 100644
--- a/finlog_app/app/lib/modules/login/pages/login_page.dart
+++ b/finlog_app/app/lib/modules/login/pages/login_page.dart
@@ -1,4 +1,4 @@
-import 'package:app/app/router.dart';
+import 'package:app/core/app/router.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';