diff --git a/app/lib/modules/dev_mode/dev_mode.dart b/app/lib/modules/dev_mode/dev_mode.dart
index ac818061..12142b9b 100644
--- a/app/lib/modules/dev_mode/dev_mode.dart
+++ b/app/lib/modules/dev_mode/dev_mode.dart
@@ -1 +1 @@
-export 'presentation/dev_mode_view.dart';
+export 'view/dev_mode_view.dart';
diff --git a/app/lib/modules/dev_mode/presentation/dev_mode_view.dart b/app/lib/modules/dev_mode/view/dev_mode_view.dart
similarity index 100%
rename from app/lib/modules/dev_mode/presentation/dev_mode_view.dart
rename to app/lib/modules/dev_mode/view/dev_mode_view.dart
diff --git a/app/lib/modules/login/presentation/cubit/login_cubit.dart b/app/lib/modules/login/cubit/login_cubit.dart
similarity index 100%
rename from app/lib/modules/login/presentation/cubit/login_cubit.dart
rename to app/lib/modules/login/cubit/login_cubit.dart
diff --git a/app/lib/modules/login/login.dart b/app/lib/modules/login/login.dart
index 29b200c9..f357cd34 100644
--- a/app/lib/modules/login/login.dart
+++ b/app/lib/modules/login/login.dart
@@ -1 +1,6 @@
-export 'presentation/presentation.dart';
+export 'cubit/login_cubit.dart';
+export 'view/login_view.dart';
+export 'view/sign_in_view.dart';
+export 'view/verification_code_view.dart';
+export 'widgets/select_gender.dart';
+export 'widgets/select_lang.dart';
diff --git a/app/lib/modules/login/presentation/presentation.dart b/app/lib/modules/login/presentation/presentation.dart
deleted file mode 100644
index f357cd34..00000000
--- a/app/lib/modules/login/presentation/presentation.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-export 'cubit/login_cubit.dart';
-export 'view/login_view.dart';
-export 'view/sign_in_view.dart';
-export 'view/verification_code_view.dart';
-export 'widgets/select_gender.dart';
-export 'widgets/select_lang.dart';
diff --git a/app/lib/modules/login/presentation/view/login_view.dart b/app/lib/modules/login/view/login_view.dart
similarity index 100%
rename from app/lib/modules/login/presentation/view/login_view.dart
rename to app/lib/modules/login/view/login_view.dart
diff --git a/app/lib/modules/login/presentation/view/sign_in_view.dart b/app/lib/modules/login/view/sign_in_view.dart
similarity index 100%
rename from app/lib/modules/login/presentation/view/sign_in_view.dart
rename to app/lib/modules/login/view/sign_in_view.dart
diff --git a/app/lib/modules/login/presentation/view/verification_code_view.dart b/app/lib/modules/login/view/verification_code_view.dart
similarity index 100%
rename from app/lib/modules/login/presentation/view/verification_code_view.dart
rename to app/lib/modules/login/view/verification_code_view.dart
diff --git a/app/lib/modules/login/presentation/widgets/select_gender.dart b/app/lib/modules/login/widgets/select_gender.dart
similarity index 100%
rename from app/lib/modules/login/presentation/widgets/select_gender.dart
rename to app/lib/modules/login/widgets/select_gender.dart
diff --git a/app/lib/modules/login/presentation/widgets/select_lang.dart b/app/lib/modules/login/widgets/select_lang.dart
similarity index 100%
rename from app/lib/modules/login/presentation/widgets/select_lang.dart
rename to app/lib/modules/login/widgets/select_lang.dart
diff --git a/app/lib/modules/main/main.dart b/app/lib/modules/main/main.dart
index 035429c2..446e890d 100644
--- a/app/lib/modules/main/main.dart
+++ b/app/lib/modules/main/main.dart
@@ -1 +1 @@
-export 'presentation/main_view.dart';
+export 'view/main_view.dart';
diff --git a/app/lib/modules/main/presentation/main_view.dart b/app/lib/modules/main/view/main_view.dart
similarity index 100%
rename from app/lib/modules/main/presentation/main_view.dart
rename to app/lib/modules/main/view/main_view.dart
diff --git a/app/lib/modules/quran_audio/logic/quran_audio_cubit.dart b/app/lib/modules/quran_audio/cubit/quran_audio_cubit.dart
similarity index 100%
rename from app/lib/modules/quran_audio/logic/quran_audio_cubit.dart
rename to app/lib/modules/quran_audio/cubit/quran_audio_cubit.dart
diff --git a/app/lib/modules/quran_audio/logic/quran_audio_state.dart b/app/lib/modules/quran_audio/cubit/quran_audio_state.dart
similarity index 100%
rename from app/lib/modules/quran_audio/logic/quran_audio_state.dart
rename to app/lib/modules/quran_audio/cubit/quran_audio_state.dart
diff --git a/app/lib/modules/quran_audio/quran_audio.dart b/app/lib/modules/quran_audio/quran_audio.dart
index 32c26d55..5e1179d7 100644
--- a/app/lib/modules/quran_audio/quran_audio.dart
+++ b/app/lib/modules/quran_audio/quran_audio.dart
@@ -1,3 +1,3 @@
-export 'logic/quran_audio_cubit.dart';
+export 'cubit/quran_audio_cubit.dart';
 export 'view/quran_audio_view.dart';
 export 'widgets/audio_borrom_sheet.dart';
diff --git a/app/lib/modules/settings/presentation/presentation.dart b/app/lib/modules/settings/presentation/presentation.dart
deleted file mode 100644
index 52daa1c7..00000000
--- a/app/lib/modules/settings/presentation/presentation.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-export 'view/about_us.dart';
-export 'view/contact_us.dart';
-export 'view/developers_view.dart';
-export 'view/gender_settings.dart';
-export 'view/lang_settings.dart';
-export 'view/settings_view.dart';
-export 'view/theme_settings.dart';
-export 'widgets/widgets.dart';
diff --git a/app/lib/modules/settings/settings.dart b/app/lib/modules/settings/settings.dart
index 29b200c9..52daa1c7 100644
--- a/app/lib/modules/settings/settings.dart
+++ b/app/lib/modules/settings/settings.dart
@@ -1 +1,8 @@
-export 'presentation/presentation.dart';
+export 'view/about_us.dart';
+export 'view/contact_us.dart';
+export 'view/developers_view.dart';
+export 'view/gender_settings.dart';
+export 'view/lang_settings.dart';
+export 'view/settings_view.dart';
+export 'view/theme_settings.dart';
+export 'widgets/widgets.dart';
diff --git a/app/lib/modules/settings/presentation/view/about_us.dart b/app/lib/modules/settings/view/about_us.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/about_us.dart
rename to app/lib/modules/settings/view/about_us.dart
diff --git a/app/lib/modules/settings/presentation/view/contact_us.dart b/app/lib/modules/settings/view/contact_us.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/contact_us.dart
rename to app/lib/modules/settings/view/contact_us.dart
diff --git a/app/lib/modules/settings/presentation/view/developers_view.dart b/app/lib/modules/settings/view/developers_view.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/developers_view.dart
rename to app/lib/modules/settings/view/developers_view.dart
diff --git a/app/lib/modules/settings/presentation/view/gender_settings.dart b/app/lib/modules/settings/view/gender_settings.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/gender_settings.dart
rename to app/lib/modules/settings/view/gender_settings.dart
diff --git a/app/lib/modules/settings/presentation/view/lang_settings.dart b/app/lib/modules/settings/view/lang_settings.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/lang_settings.dart
rename to app/lib/modules/settings/view/lang_settings.dart
diff --git a/app/lib/modules/settings/presentation/view/settings_view.dart b/app/lib/modules/settings/view/settings_view.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/settings_view.dart
rename to app/lib/modules/settings/view/settings_view.dart
diff --git a/app/lib/modules/settings/presentation/view/theme_settings.dart b/app/lib/modules/settings/view/theme_settings.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/view/theme_settings.dart
rename to app/lib/modules/settings/view/theme_settings.dart
diff --git a/app/lib/modules/settings/presentation/widgets/contact_us_card.dart b/app/lib/modules/settings/widgets/contact_us_card.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/widgets/contact_us_card.dart
rename to app/lib/modules/settings/widgets/contact_us_card.dart
diff --git a/app/lib/modules/settings/presentation/widgets/social_icon_button.dart b/app/lib/modules/settings/widgets/social_icon_button.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/widgets/social_icon_button.dart
rename to app/lib/modules/settings/widgets/social_icon_button.dart
diff --git a/app/lib/modules/settings/presentation/widgets/widgets.dart b/app/lib/modules/settings/widgets/widgets.dart
similarity index 100%
rename from app/lib/modules/settings/presentation/widgets/widgets.dart
rename to app/lib/modules/settings/widgets/widgets.dart