diff --git a/lib/app_router.dart b/lib/core/app_router.dart
similarity index 100%
rename from lib/app_router.dart
rename to lib/core/app_router.dart
diff --git a/lib/core/initialization_cubit/initialization_cubit.dart b/lib/core/initialization_cubit/initialization_cubit.dart
index 93e02a47..aedcc3cd 100644
--- a/lib/core/initialization_cubit/initialization_cubit.dart
+++ b/lib/core/initialization_cubit/initialization_cubit.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
-import 'package:eatvio_app/locator_service.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class InitializationCubit extends Cubit<InitializationState> {
diff --git a/lib/locator_service.dart b/lib/core/locator_service.dart
similarity index 100%
rename from lib/locator_service.dart
rename to lib/core/locator_service.dart
diff --git a/lib/theme/app_decoration.dart b/lib/core/theme/app_decoration.dart
similarity index 98%
rename from lib/theme/app_decoration.dart
rename to lib/core/theme/app_decoration.dart
index b84dc7fe..eb2c4372 100644
--- a/lib/theme/app_decoration.dart
+++ b/lib/core/theme/app_decoration.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class AppDecoration {
diff --git a/lib/theme/custom_button_style.dart b/lib/core/theme/custom_button_style.dart
similarity index 92%
rename from lib/theme/custom_button_style.dart
rename to lib/core/theme/custom_button_style.dart
index 57e3ca9e..50b9d186 100644
--- a/lib/theme/custom_button_style.dart
+++ b/lib/core/theme/custom_button_style.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 /// A class that offers pre-defined button styles for customizing button appearance.
diff --git a/lib/theme/custom_text_style.dart b/lib/core/theme/custom_text_style.dart
similarity index 99%
rename from lib/theme/custom_text_style.dart
rename to lib/core/theme/custom_text_style.dart
index dcc15aea..91ddffa2 100644
--- a/lib/theme/custom_text_style.dart
+++ b/lib/core/theme/custom_text_style.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 /// A collection of pre-defined text styles for customizing text appearance,
diff --git a/lib/theme/theme_helper.dart b/lib/core/theme/theme_helper.dart
similarity index 100%
rename from lib/theme/theme_helper.dart
rename to lib/core/theme/theme_helper.dart
diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart
index c73e2aba..bc795829 100644
--- a/lib/core/token_storage.dart
+++ b/lib/core/token_storage.dart
@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:eatvio_app/locator_service.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 abstract class TokenStorage {
diff --git a/lib/core/utils/toasts.dart b/lib/core/utils/toasts.dart
index 18195ccd..2f86daa9 100644
--- a/lib/core/utils/toasts.dart
+++ b/lib/core/utils/toasts.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
 const int _toastDuration = 2;
diff --git a/lib/widgets/base_button.dart b/lib/core/widgets/base_button.dart
similarity index 100%
rename from lib/widgets/base_button.dart
rename to lib/core/widgets/base_button.dart
diff --git a/lib/core/widgets/bookmark_button.dart b/lib/core/widgets/bookmark_button.dart
index b8d767ac..c9e939c4 100644
--- a/lib/core/widgets/bookmark_button.dart
+++ b/lib/core/widgets/bookmark_button.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class BookmarkButton extends StatelessWidget {
diff --git a/lib/core/widgets/bottom_sheet_handler_bar.dart b/lib/core/widgets/bottom_sheet_handler_bar.dart
index 1645fda5..ceaf2bca 100644
--- a/lib/core/widgets/bottom_sheet_handler_bar.dart
+++ b/lib/core/widgets/bottom_sheet_handler_bar.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class BottomSheetHandlerBar extends StatelessWidget {
diff --git a/lib/core/widgets/custom_divider.dart b/lib/core/widgets/custom_divider.dart
index 8262ee4a..7bf88514 100644
--- a/lib/core/widgets/custom_divider.dart
+++ b/lib/core/widgets/custom_divider.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class CustomDivider extends StatelessWidget {
diff --git a/lib/widgets/custom_drop_down.dart b/lib/core/widgets/custom_drop_down.dart
similarity index 100%
rename from lib/widgets/custom_drop_down.dart
rename to lib/core/widgets/custom_drop_down.dart
diff --git a/lib/widgets/custom_outlined_button.dart b/lib/core/widgets/custom_outlined_button.dart
similarity index 96%
rename from lib/widgets/custom_outlined_button.dart
rename to lib/core/widgets/custom_outlined_button.dart
index 549052f8..38a9be27 100644
--- a/lib/widgets/custom_outlined_button.dart
+++ b/lib/core/widgets/custom_outlined_button.dart
@@ -1,5 +1,5 @@
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/widgets/base_button.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/widgets/base_button.dart';
 import 'package:flutter/material.dart';
 
 class CustomOutlinedButton extends BaseButton {
diff --git a/lib/widgets/custom_text_form_field.dart b/lib/core/widgets/custom_text_form_field.dart
similarity index 98%
rename from lib/widgets/custom_text_form_field.dart
rename to lib/core/widgets/custom_text_form_field.dart
index 6054079f..2ce5a525 100644
--- a/lib/widgets/custom_text_form_field.dart
+++ b/lib/core/widgets/custom_text_form_field.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
diff --git a/lib/core/widgets/diet_info_row.dart b/lib/core/widgets/diet_info_row.dart
index bf365a5d..06c910bb 100644
--- a/lib/core/widgets/diet_info_row.dart
+++ b/lib/core/widgets/diet_info_row.dart
@@ -1,10 +1,10 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/utils/localization_utils.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/type_badges.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
diff --git a/lib/core/widgets/feed_icon_button.dart b/lib/core/widgets/feed_icon_button.dart
index e3744f9c..c6e5a70d 100644
--- a/lib/core/widgets/feed_icon_button.dart
+++ b/lib/core/widgets/feed_icon_button.dart
@@ -1,5 +1,5 @@
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
diff --git a/lib/features/auth/auth_screen/auth_screen.dart b/lib/features/auth/auth_screen/auth_screen.dart
index 998b6ac0..87bc13dd 100644
--- a/lib/features/auth/auth_screen/auth_screen.dart
+++ b/lib/features/auth/auth_screen/auth_screen.dart
@@ -3,11 +3,12 @@ import 'dart:convert';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
@@ -44,7 +45,7 @@ class _AuthScreenState extends State<AuthScreen> {
     return Scaffold(
       appBar: AppBar(
         centerTitle: true,
-        title: Image.asset(
+        title: SvgPicture.asset(
           ImageConstant.imgLogoEatvio,
           height: 48,
           fit: BoxFit.contain,
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index 7c27ab09..a1dd837f 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/commen
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
diff --git a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
index c09cbf94..2dce271e 100644
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:io';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
index ebab1850..fc7c278e 100644
--- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
+++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/noti
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/calendar/presentation/pages/calendar_screen.dart b/lib/features/calendar/presentation/pages/calendar_screen.dart
index 329ad7ec..495c08df 100644
--- a/lib/features/calendar/presentation/pages/calendar_screen.dart
+++ b/lib/features/calendar/presentation/pages/calendar_screen.dart
@@ -1,9 +1,9 @@
+import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
 import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 65dfd03d..a0d598a3 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/chat/presentation/pages/chat_select_screen.dart b/lib/features/chat/presentation/pages/chat_select_screen.dart
index b4660cf2..0da5dfda 100644
--- a/lib/features/chat/presentation/pages/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/cha
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/chat_select_state.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:rive/rive.dart';
diff --git a/lib/features/chat/presentation/pages/photo_view_screen.dart b/lib/features/chat/presentation/pages/photo_view_screen.dart
index 6148c52c..383a538b 100644
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/const.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:photo_view/photo_view.dart';
diff --git a/lib/features/chat/presentation/widgets/chat_entry_widget.dart b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
index 19c69160..389c53a7 100644
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_preview_model.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
diff --git a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
index 3480c923..90db1fca 100644
--- a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
@@ -1,5 +1,5 @@
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class ChatSearchBarWidget extends StatelessWidget {
diff --git a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
index e51aff3a..da799a5e 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
index c125ac1d..8b4f969b 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
diff --git a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
index 27a4aa71..cef02ded 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/consultant/become_consultant/entities/diploma_entity.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
index d24f205a..54f66c55 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
index eae359c2..5a547050 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:image_picker/image_picker.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
index 764f1653..8320381d 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class RegistrationAsScreen extends StatefulWidget {
diff --git a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
index fb62e42d..ed754c67 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
index eb1358ea..e9aa8985 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
@@ -6,10 +6,11 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/pa
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
 
@@ -214,7 +215,7 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
             ),
           ),
           centerTitle: true,
-          title: Image.asset(
+          title: SvgPicture.asset(
             ImageConstant.imgLogoEatvio,
             height: 48,
             fit: BoxFit.contain,
diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart
index 6c19ceb6..c8c4740e 100644
--- a/lib/features/diary/presentation/pages/diary_screen.dart
+++ b/lib/features/diary/presentation/pages/diary_screen.dart
@@ -9,9 +9,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/finish_day_button
 import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
 import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
index 1b6d0a3f..35a272a0 100644
--- a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
index 57896321..1fb44138 100644
--- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
+++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 
diff --git a/lib/features/diets/presentation/pages/about_diet_screen.dart b/lib/features/diets/presentation/pages/about_diet_screen.dart
index 8173f15a..e3053468 100644
--- a/lib/features/diets/presentation/pages/about_diet_screen.dart
+++ b/lib/features/diets/presentation/pages/about_diet_screen.dart
@@ -21,9 +21,9 @@ import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/commen
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_portal/flutter_portal.dart';
diff --git a/lib/features/diets/presentation/widgets/author_card.dart b/lib/features/diets/presentation/widgets/author_card.dart
index c277ef30..b3e0ea92 100644
--- a/lib/features/diets/presentation/widgets/author_card.dart
+++ b/lib/features/diets/presentation/widgets/author_card.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/diets/presentation/widgets/calendar_widget.dart b/lib/features/diets/presentation/widgets/calendar_widget.dart
index 4c156035..c3ff1ee1 100644
--- a/lib/features/diets/presentation/widgets/calendar_widget.dart
+++ b/lib/features/diets/presentation/widgets/calendar_widget.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/core/utils/string_extentions.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:table_calendar/table_calendar.dart';
diff --git a/lib/features/diets/presentation/widgets/cpfc_container.dart b/lib/features/diets/presentation/widgets/cpfc_container.dart
index bd211b21..113c689d 100644
--- a/lib/features/diets/presentation/widgets/cpfc_container.dart
+++ b/lib/features/diets/presentation/widgets/cpfc_container.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class CpfcContainer extends StatelessWidget {
diff --git a/lib/features/diets/presentation/widgets/expandable_text.dart b/lib/features/diets/presentation/widgets/expandable_text.dart
index 80ecb6a3..c2decf4c 100644
--- a/lib/features/diets/presentation/widgets/expandable_text.dart
+++ b/lib/features/diets/presentation/widgets/expandable_text.dart
@@ -1,8 +1,8 @@
 import 'dart:math' as math;
 
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/diets/presentation/widgets/info_bouble.dart b/lib/features/diets/presentation/widgets/info_bouble.dart
index 870859dd..7f339420 100644
--- a/lib/features/diets/presentation/widgets/info_bouble.dart
+++ b/lib/features/diets/presentation/widgets/info_bouble.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class InfoBouble extends StatelessWidget {
diff --git a/lib/features/diets/presentation/widgets/main_background_bouble.dart b/lib/features/diets/presentation/widgets/main_background_bouble.dart
index 8b94131e..46e13f09 100644
--- a/lib/features/diets/presentation/widgets/main_background_bouble.dart
+++ b/lib/features/diets/presentation/widgets/main_background_bouble.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class MainBackgroundBouble extends StatelessWidget {
diff --git a/lib/features/diets/presentation/widgets/more_options.dart b/lib/features/diets/presentation/widgets/more_options.dart
index 675ecd7e..862405f2 100644
--- a/lib/features/diets/presentation/widgets/more_options.dart
+++ b/lib/features/diets/presentation/widgets/more_options.dart
@@ -3,8 +3,8 @@ import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/main_background_bouble.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart b/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
index 63facccf..db2ecc95 100644
--- a/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
+++ b/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
@@ -2,9 +2,9 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/calendar_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
 import 'package:flutter/material.dart';
 
 class StartDietBottomSheet extends StatelessWidget {
diff --git a/lib/features/diets/presentation/widgets/type_badges.dart b/lib/features/diets/presentation/widgets/type_badges.dart
index 6d7e2b73..b1d21fc4 100644
--- a/lib/features/diets/presentation/widgets/type_badges.dart
+++ b/lib/features/diets/presentation/widgets/type_badges.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/diets/presentation/widgets/main_background_bouble.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_portal/flutter_portal.dart';
 import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/feed/presentation/pages/feed_screen.dart b/lib/features/feed/presentation/pages/feed_screen.dart
index d55f6579..ca9fd146 100644
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -15,8 +15,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dar
 import 'package:eatvio_app/features/feed/presentation/widgets/tags_modal_widget.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_cubit.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index ff7dc653..e10ff485 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
diff --git a/lib/features/feed/presentation/widgets/choice_chip_widget.dart b/lib/features/feed/presentation/widgets/choice_chip_widget.dart
index acadd0d7..d20a2dad 100644
--- a/lib/features/feed/presentation/widgets/choice_chip_widget.dart
+++ b/lib/features/feed/presentation/widgets/choice_chip_widget.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class ChoiceChipWidget extends StatelessWidget {
diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart
index 72be3b63..96391ca8 100644
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart b/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
index 6ebb2a20..37d720d3 100644
--- a/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
+++ b/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
@@ -3,8 +3,8 @@ import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/sorting_drop_down_filter.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/type_choice_filter_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
 class DietFilterBottomSheet extends StatelessWidget {
diff --git a/lib/features/feed/presentation/widgets/diets_widget.dart b/lib/features/feed/presentation/widgets/diets_widget.dart
index b41bb869..7b51f7f4 100644
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -5,8 +5,8 @@ import 'package:eatvio_app/core/widgets/diet_info_row.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
diff --git a/lib/features/feed/presentation/widgets/filter_badge.dart b/lib/features/feed/presentation/widgets/filter_badge.dart
index 2b49e645..6f7f5d9f 100644
--- a/lib/features/feed/presentation/widgets/filter_badge.dart
+++ b/lib/features/feed/presentation/widgets/filter_badge.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
diff --git a/lib/features/feed/presentation/widgets/recipes_widget.dart b/lib/features/feed/presentation/widgets/recipes_widget.dart
index 348ac841..9e93074b 100644
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -1,7 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart b/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
index 3c6fea42..c9e21c1e 100644
--- a/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
+++ b/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:collection/collection.dart';
 
diff --git a/lib/features/feed/presentation/widgets/tags_modal_widget.dart b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
index 21618511..51b2fca0 100644
--- a/lib/features/feed/presentation/widgets/tags_modal_widget.dart
+++ b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_tag_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart
index 1ed46aec..58f0fea3 100644
--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -2,8 +2,8 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index 48ace714..d84e7611 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -9,8 +9,8 @@ import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/prof
 import 'package:eatvio_app/features/profile/presentation/widgets/circumference_chart_widget.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/imt_chart_widget.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
index eb37ec13..f116ccf5 100644
--- a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/profile/models/circumference_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/features/profile/presentation/widgets/imt_chart_widget.dart b/lib/features/profile/presentation/widgets/imt_chart_widget.dart
index abd8e05b..4738581d 100644
--- a/lib/features/profile/presentation/widgets/imt_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/imt_chart_widget.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/profile/models/weight_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/features/profile/presentation/widgets/weight_chart_widget.dart b/lib/features/profile/presentation/widgets/weight_chart_widget.dart
index b1c2b7db..79322426 100644
--- a/lib/features/profile/presentation/widgets/weight_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/weight_chart_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/profile/models/weight_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/features/recipes/presentation/pages/about_recipes_screen.dart b/lib/features/recipes/presentation/pages/about_recipes_screen.dart
index b54fed1f..4fd97a0f 100644
--- a/lib/features/recipes/presentation/pages/about_recipes_screen.dart
+++ b/lib/features/recipes/presentation/pages/about_recipes_screen.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
diff --git a/lib/features/recipes/presentation/pages/recipe_create_screen.dart b/lib/features/recipes/presentation/pages/recipe_create_screen.dart
index 669caca3..6c7b51fc 100644
--- a/lib/features/recipes/presentation/pages/recipe_create_screen.dart
+++ b/lib/features/recipes/presentation/pages/recipe_create_screen.dart
@@ -1,16 +1,16 @@
 import 'dart:io';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/recipes/models/product.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/models/step.dart' as step;
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart';
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/recipes/presentation/pages/recipe_edit_screen.dart b/lib/features/recipes/presentation/pages/recipe_edit_screen.dart
index 174c0e99..0f0c88f8 100644
--- a/lib/features/recipes/presentation/pages/recipe_edit_screen.dart
+++ b/lib/features/recipes/presentation/pages/recipe_edit_screen.dart
@@ -1,15 +1,15 @@
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/recipes/models/product.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/models/step.dart' as step;
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart';
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_state.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
index 52c1c039..78af9980 100644
--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/core/app_router.dart';
 
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
diff --git a/lib/features/registration/presentation/pages/additional_information_screen.dart b/lib/features/registration/presentation/pages/additional_information_screen.dart
index c3d70fc4..dc8e9b3d 100644
--- a/lib/features/registration/presentation/pages/additional_information_screen.dart
+++ b/lib/features/registration/presentation/pages/additional_information_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/allergies_screen.dart b/lib/features/registration/presentation/pages/allergies_screen.dart
index 430c4438..d87df3d0 100644
--- a/lib/features/registration/presentation/pages/allergies_screen.dart
+++ b/lib/features/registration/presentation/pages/allergies_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/blood_pressure_screen.dart b/lib/features/registration/presentation/pages/blood_pressure_screen.dart
index 7e2b8c0c..cc8af83c 100644
--- a/lib/features/registration/presentation/pages/blood_pressure_screen.dart
+++ b/lib/features/registration/presentation/pages/blood_pressure_screen.dart
@@ -1,10 +1,10 @@
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/body_circumferences_screen.dart b/lib/features/registration/presentation/pages/body_circumferences_screen.dart
index 0f6fc0f2..728ef182 100644
--- a/lib/features/registration/presentation/pages/body_circumferences_screen.dart
+++ b/lib/features/registration/presentation/pages/body_circumferences_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/city_of_living_screen.dart b/lib/features/registration/presentation/pages/city_of_living_screen.dart
index 1f2755e0..177c036f 100644
--- a/lib/features/registration/presentation/pages/city_of_living_screen.dart
+++ b/lib/features/registration/presentation/pages/city_of_living_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/credentials_screen.dart b/lib/features/registration/presentation/pages/credentials_screen.dart
index 325b3d89..b5aa404a 100644
--- a/lib/features/registration/presentation/pages/credentials_screen.dart
+++ b/lib/features/registration/presentation/pages/credentials_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/date_of_birth_screen.dart b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
index 0ca4b3b9..6369c2c0 100644
--- a/lib/features/registration/presentation/pages/date_of_birth_screen.dart
+++ b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/favorite_foods_screen.dart b/lib/features/registration/presentation/pages/favorite_foods_screen.dart
index 2de9c71c..a7176ce5 100644
--- a/lib/features/registration/presentation/pages/favorite_foods_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_foods_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/favorite_sports_screen.dart b/lib/features/registration/presentation/pages/favorite_sports_screen.dart
index bf54612e..88af7f5a 100644
--- a/lib/features/registration/presentation/pages/favorite_sports_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_sports_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/height_screen.dart b/lib/features/registration/presentation/pages/height_screen.dart
index 93ab620b..4e43bea7 100644
--- a/lib/features/registration/presentation/pages/height_screen.dart
+++ b/lib/features/registration/presentation/pages/height_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/language_select_screen.dart b/lib/features/registration/presentation/pages/language_select_screen.dart
index 638a207e..2fac31d6 100644
--- a/lib/features/registration/presentation/pages/language_select_screen.dart
+++ b/lib/features/registration/presentation/pages/language_select_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/medicine_intake_screen.dart b/lib/features/registration/presentation/pages/medicine_intake_screen.dart
index 2383bd16..f7069a49 100644
--- a/lib/features/registration/presentation/pages/medicine_intake_screen.dart
+++ b/lib/features/registration/presentation/pages/medicine_intake_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/name_screen.dart b/lib/features/registration/presentation/pages/name_screen.dart
index b2211961..1b7dd28e 100644
--- a/lib/features/registration/presentation/pages/name_screen.dart
+++ b/lib/features/registration/presentation/pages/name_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/lib/features/registration/presentation/pages/registration_screen.dart b/lib/features/registration/presentation/pages/registration_screen.dart
index c5cc8826..c36bd18e 100644
--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -17,10 +17,11 @@ import 'package:eatvio_app/features/registration/presentation/pages/medicine_int
 import 'package:eatvio_app/features/registration/presentation/pages/name_screen.dart';
 import 'package:eatvio_app/features/registration/presentation/pages/weight_screen.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:rive/rive.dart' as rive;
 import 'package:validators/validators.dart';
@@ -115,7 +116,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
                 ),
               ),
               centerTitle: true,
-              title: Image.asset(
+              title: SvgPicture.asset(
                 ImageConstant.imgLogoEatvio,
                 height: 48,
                 fit: BoxFit.contain,
diff --git a/lib/features/registration/presentation/pages/weight_screen.dart b/lib/features/registration/presentation/pages/weight_screen.dart
index 4f8e9b9f..364804d0 100644
--- a/lib/features/registration/presentation/pages/weight_screen.dart
+++ b/lib/features/registration/presentation/pages/weight_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/settings/presentation/pages/general_info_screen.dart b/lib/features/settings/presentation/pages/general_info_screen.dart
index 693e909d..df43e5b7 100644
--- a/lib/features/settings/presentation/pages/general_info_screen.dart
+++ b/lib/features/settings/presentation/pages/general_info_screen.dart
@@ -1,11 +1,11 @@
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/other_info_screen.dart b/lib/features/settings/presentation/pages/other_info_screen.dart
index 4cb62dc4..c322aacf 100644
--- a/lib/features/settings/presentation/pages/other_info_screen.dart
+++ b/lib/features/settings/presentation/pages/other_info_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
diff --git a/lib/features/settings/presentation/pages/physical_activity_screen.dart b/lib/features/settings/presentation/pages/physical_activity_screen.dart
index 7718403d..0f1bfb5b 100644
--- a/lib/features/settings/presentation/pages/physical_activity_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_activity_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
diff --git a/lib/features/settings/presentation/pages/physical_form_screen.dart b/lib/features/settings/presentation/pages/physical_form_screen.dart
index 4bd34b94..6b712a45 100644
--- a/lib/features/settings/presentation/pages/physical_form_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_form_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/pressure_screen.dart b/lib/features/settings/presentation/pages/pressure_screen.dart
index 9a7538dc..e71642fe 100644
--- a/lib/features/settings/presentation/pages/pressure_screen.dart
+++ b/lib/features/settings/presentation/pages/pressure_screen.dart
@@ -1,10 +1,10 @@
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/settings_screen.dart b/lib/features/settings/presentation/pages/settings_screen.dart
index e47a90fc..0cf68c10 100644
--- a/lib/features/settings/presentation/pages/settings_screen.dart
+++ b/lib/features/settings/presentation/pages/settings_screen.dart
@@ -2,8 +2,8 @@ import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/main.dart b/lib/main.dart
index 23b031a9..ddbacf93 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,11 +1,11 @@
-import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/initialization_cubit/initialization_cubit.dart';
+import 'package:eatvio_app/core/locator_service.dart' as di;
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart' as di;
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';