diff --git a/finlog_app/app/lib/core/features/feature_controller.dart b/finlog_app/app/lib/core/app/features/feature_controller.dart
similarity index 100%
rename from finlog_app/app/lib/core/features/feature_controller.dart
rename to finlog_app/app/lib/core/app/features/feature_controller.dart
diff --git a/finlog_app/app/lib/core/app/router.dart b/finlog_app/app/lib/core/app/router.dart
index 0f0ca54..9a591fb 100644
--- a/finlog_app/app/lib/core/app/router.dart
+++ b/finlog_app/app/lib/core/app/router.dart
@@ -1,4 +1,4 @@
-import 'package:app/modules/app_shell.dart';
+import 'package:app/core/app_shell.dart';
 import 'package:app/modules/budget/budget_view.dart';
 import 'package:app/modules/car/car_view.dart';
 import 'package:app/modules/dashboard/dashboard_view.dart';
diff --git a/finlog_app/app/lib/modules/app_shell.dart b/finlog_app/app/lib/core/app_shell.dart
similarity index 96%
rename from finlog_app/app/lib/modules/app_shell.dart
rename to finlog_app/app/lib/core/app_shell.dart
index 6c3a7b9..8a4d5a9 100644
--- a/finlog_app/app/lib/modules/app_shell.dart
+++ b/finlog_app/app/lib/core/app_shell.dart
@@ -1,5 +1,5 @@
 import 'package:app/core/app/router.dart';
-import 'package:app/core/features/feature_controller.dart';
+import 'package:app/core/app/features/feature_controller.dart';
 import 'package:app/core/i18n/translations.g.dart';
 import 'package:app/core/ui/glas_bottom_bar.dart';
 import 'package:flutter/material.dart';
@@ -322,20 +322,3 @@ class _DesktopDrawer extends StatelessWidget {
     );
   }
 }
-
-class _LogoHeader extends StatelessWidget {
-  const _LogoHeader();
-
-  @override
-  Widget build(BuildContext context) {
-    return const Padding(
-      padding: EdgeInsets.all(16),
-      child: Row(
-        children: [
-          Icon(Icons.account_balance_wallet, size: 28),
-          SizedBox(width: 8),
-        ],
-      ),
-    );
-  }
-}
diff --git a/finlog_app/app/lib/main.dart b/finlog_app/app/lib/main.dart
index 8d11952..5a1f227 100644
--- a/finlog_app/app/lib/main.dart
+++ b/finlog_app/app/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:app/core/app/router.dart';
 import 'package:app/core/app/startup/domain/initialize_app.dart';
-import 'package:app/core/features/feature_controller.dart';
+import 'package:app/core/app/features/feature_controller.dart';
 import 'package:app/core/i18n/translations.g.dart';
 import 'package:app/core/ui/controller/locale_controller.dart';
 import 'package:app/core/ui/controller/scale_controller.dart';
diff --git a/finlog_app/app/lib/modules/settings/modules/app/features_settings_view.dart b/finlog_app/app/lib/modules/settings/modules/app/features_settings_view.dart
index bd47d3c..768edab 100644
--- a/finlog_app/app/lib/modules/settings/modules/app/features_settings_view.dart
+++ b/finlog_app/app/lib/modules/settings/modules/app/features_settings_view.dart
@@ -1,4 +1,4 @@
-import 'package:app/core/features/feature_controller.dart';
+import 'package:app/core/app/features/feature_controller.dart';
 import 'package:app/modules/settings/modules/app/model/feature_settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
diff --git a/finlog_app/app/lib/modules/settings/modules/app/model/feature_settings_view_model.dart b/finlog_app/app/lib/modules/settings/modules/app/model/feature_settings_view_model.dart
index be83d20..664a941 100644
--- a/finlog_app/app/lib/modules/settings/modules/app/model/feature_settings_view_model.dart
+++ b/finlog_app/app/lib/modules/settings/modules/app/model/feature_settings_view_model.dart
@@ -1,4 +1,4 @@
-import 'package:app/core/features/feature_controller.dart';
+import 'package:app/core/app/features/feature_controller.dart';
 import 'package:flutter/foundation.dart';
 
 /// Lightweight VM that wraps FeatureController for the Settings screen.