diff --git a/lib/Modele/user.dart b/lib/Modele/user.dart
index 289622d..fa7da89 100644
--- a/lib/Modele/user.dart
+++ b/lib/Modele/user.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:smartfit_app_mobile/Modele/activity.dart';
+import 'package:smartfit_app_mobile/modele/activity.dart';
 
 class User extends ChangeNotifier {
   String username = "VOID";
diff --git a/lib/Modele/utile/login_user.dart b/lib/Modele/utile/login_user.dart
index 9ea6964..261e75c 100644
--- a/lib/Modele/utile/login_user.dart
+++ b/lib/Modele/utile/login_user.dart
@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'package:crypto/crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart';
 import 'package:smartfit_app_mobile/Modele/Api/request_api.dart';
-import 'package:smartfit_app_mobile/Modele/user.dart';
+import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
+import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:tuple/tuple.dart';
 
 class Login {
diff --git a/lib/Modele/utile/signup_user.dart b/lib/Modele/utile/signup_user.dart
index b9d26f4..dd678b4 100644
--- a/lib/Modele/utile/signup_user.dart
+++ b/lib/Modele/utile/signup_user.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:crypto/crypto.dart';
-import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart';
 import 'package:smartfit_app_mobile/Modele/Api/request_api.dart';
+import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
 import 'package:tuple/tuple.dart';
 
 class SignUp {
diff --git a/lib/View/activity/activity.dart b/lib/View/activity/activity.dart
index db6d9a7..5198ab7 100644
--- a/lib/View/activity/activity.dart
+++ b/lib/View/activity/activity.dart
@@ -1,12 +1,6 @@
 import 'package:responsive_builder/responsive_builder.dart';
-import 'package:smartfit_app_mobile/View/home/mobile/mobile_Activity_view.dart';
-import 'package:smartfit_app_mobile/View/home/mobile/mobile_homeview.dart';
-import 'package:smartfit_app_mobile/View/home/web/web_Activity_view.dart';
-import 'package:smartfit_app_mobile/View/home/web/web_homeview.dart';
-import 'package:smartfit_app_mobile/common_widget/steps.dart';
-import 'package:smartfit_app_mobile/common_widget/graph.dart';
-import 'package:smartfit_app_mobile/common_widget/info.dart' hide Stats;
-import 'package:smartfit_app_mobile/common_widget/stats.dart';
+import 'package:smartfit_app_mobile/view/home/mobile/mobile_Activity_view.dart';
+import 'package:smartfit_app_mobile/view/home/web/web_Activity_view.dart';
 import 'package:flutter/material.dart';
 
 class Activity extends StatelessWidget {
diff --git a/lib/View/home/mobile/mobile_homeview.dart b/lib/View/home/mobile/mobile_homeview.dart
index 2c836c1..e5522e8 100644
--- a/lib/View/home/mobile/mobile_homeview.dart
+++ b/lib/View/home/mobile/mobile_homeview.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:simple_animation_progress_bar/simple_animation_progress_bar.dart';
 import 'package:simple_circular_progress_bar/simple_circular_progress_bar.dart';
-import 'package:smartfit_app_mobile/Modele/user.dart';
+import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/view/home/activity_tracker.dart';
diff --git a/lib/View/home/web/web_homeview.dart b/lib/View/home/web/web_homeview.dart
index bfe29fb..9c63d2c 100644
--- a/lib/View/home/web/web_homeview.dart
+++ b/lib/View/home/web/web_homeview.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:simple_animation_progress_bar/simple_animation_progress_bar.dart';
 import 'package:simple_circular_progress_bar/simple_circular_progress_bar.dart';
-import 'package:smartfit_app_mobile/Modele/user.dart';
+import 'package:smartfit_app_mobile/modele/user.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/view/home/activity_tracker.dart';
diff --git a/lib/View/login/Mobile/android_login_view.dart b/lib/View/login/Mobile/android_login_view.dart
index 371966b..1fe51f3 100644
--- a/lib/View/login/Mobile/android_login_view.dart
+++ b/lib/View/login/Mobile/android_login_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:smartfit_app_mobile/Modele/utile/login_user.dart';
-import 'package:smartfit_app_mobile/View/main_tab/main_tab_view.dart';
+import 'package:smartfit_app_mobile/modele/utile/login_user.dart';
+import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/common_widget/round_text_field.dart';
diff --git a/lib/View/login/Mobile/android_signup_view.dart b/lib/View/login/Mobile/android_signup_view.dart
index 63be393..7c39c1c 100644
--- a/lib/View/login/Mobile/android_signup_view.dart
+++ b/lib/View/login/Mobile/android_signup_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:smartfit_app_mobile/Modele/utile/signup_user.dart';
-import 'package:smartfit_app_mobile/View/login/login_view.dart';
+import 'package:smartfit_app_mobile/modele/utile/signup_user.dart';
+import 'package:smartfit_app_mobile/view/login/login_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/common_widget/round_text_field.dart';
diff --git a/lib/View/login/login_view.dart b/lib/View/login/login_view.dart
index 1290373..55fe3bb 100644
--- a/lib/View/login/login_view.dart
+++ b/lib/View/login/login_view.dart
@@ -1,6 +1,6 @@
 import 'package:responsive_builder/responsive_builder.dart';
-import 'package:smartfit_app_mobile/View/login/Mobile/android_login_view.dart';
-import 'package:smartfit_app_mobile/View/login/web/web_login_view.dart';
+import 'package:smartfit_app_mobile/view/login/Mobile/android_login_view.dart';
+import 'package:smartfit_app_mobile/view/login/web/web_login_view.dart';
 import 'package:flutter/material.dart';
 
 class LoginView extends StatefulWidget {
diff --git a/lib/View/login/signup_view.dart b/lib/View/login/signup_view.dart
index b4630df..a94d65b 100644
--- a/lib/View/login/signup_view.dart
+++ b/lib/View/login/signup_view.dart
@@ -1,7 +1,7 @@
 import 'package:responsive_builder/responsive_builder.dart';
-import 'package:smartfit_app_mobile/View/login/Mobile/android_signup_view.dart';
+import 'package:smartfit_app_mobile/view/login/Mobile/android_signup_view.dart';
 import 'package:flutter/material.dart';
-import 'package:smartfit_app_mobile/View/login/web/web_signup_view.dart';
+import 'package:smartfit_app_mobile/view/login/web/web_signup_view.dart';
 
 class SignUpView extends StatefulWidget {
   const SignUpView({super.key});
diff --git a/lib/View/login/web/web_login_view.dart b/lib/View/login/web/web_login_view.dart
index 442341a..fd034c4 100644
--- a/lib/View/login/web/web_login_view.dart
+++ b/lib/View/login/web/web_login_view.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:provider/provider.dart';
-import 'package:smartfit_app_mobile/Modele/user.dart';
-import 'package:smartfit_app_mobile/Modele/utile/login_user.dart';
-import 'package:smartfit_app_mobile/View/main_tab/main_tab_view.dart';
+import 'package:smartfit_app_mobile/modele/utile/login_user.dart';
+import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/common_widget/round_text_field.dart';
diff --git a/lib/View/login/web/web_signup_view.dart b/lib/View/login/web/web_signup_view.dart
index 4935318..46a7087 100644
--- a/lib/View/login/web/web_signup_view.dart
+++ b/lib/View/login/web/web_signup_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:smartfit_app_mobile/Modele/utile/signup_user.dart';
-import 'package:smartfit_app_mobile/View/login/login_view.dart';
+import 'package:smartfit_app_mobile/modele/utile/signup_user.dart';
+import 'package:smartfit_app_mobile/view/login/login_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/round_button.dart';
 import 'package:smartfit_app_mobile/common_widget/round_text_field.dart';
diff --git a/lib/View/main_tab/main_tab_view.dart b/lib/View/main_tab/main_tab_view.dart
index 5075863..a7bacf6 100644
--- a/lib/View/main_tab/main_tab_view.dart
+++ b/lib/View/main_tab/main_tab_view.dart
@@ -1,4 +1,4 @@
-import 'package:smartfit_app_mobile/View/test/page_test.dart';
+import 'package:smartfit_app_mobile/view/test/page_test.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 import 'package:smartfit_app_mobile/common_widget/tab_button.dart';
 import 'package:smartfit_app_mobile/view/activity/activity.dart';
diff --git a/lib/View/main_tab/select_view.dart b/lib/View/main_tab/select_view.dart
index 4ecad70..a2786bd 100644
--- a/lib/View/main_tab/select_view.dart
+++ b/lib/View/main_tab/select_view.dart
@@ -1,8 +1,4 @@
-import 'package:smartfit_app_mobile/common_widget/round_button.dart';
-//import 'package:smartfit_app_mobile/view/meal_planner/meal_planner_view.dart';
-//import 'package:smartfit_app_mobile/view/workout_tracker/workout_tracker_view.dart';
-import 'package:flutter/material.dart';
-import 'package:smartfit_app_mobile/view/home/blank_view.dart';
+
 
 //import '../sleep_tracker/sleep_tracker_view.dart';
 /*
diff --git a/lib/View/profile/profile_view.dart b/lib/View/profile/profile_view.dart
index f7c1dfc..8556b5f 100644
--- a/lib/View/profile/profile_view.dart
+++ b/lib/View/profile/profile_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:responsive_builder/responsive_builder.dart';
-import 'package:smartfit_app_mobile/View/profile/mobile/mobile_profile_view.dart';
-import 'package:smartfit_app_mobile/View/profile/web/web_profile_view.dart';
+import 'package:smartfit_app_mobile/view/profile/mobile/mobile_profile_view.dart';
+import 'package:smartfit_app_mobile/view/profile/web/web_profile_view.dart';
 
 class ProfileView extends StatefulWidget {
   const ProfileView({super.key});
diff --git a/lib/View/test/page_test.dart b/lib/View/test/page_test.dart
index 94cdf95..d3a098f 100644
--- a/lib/View/test/page_test.dart
+++ b/lib/View/test/page_test.dart
@@ -3,16 +3,14 @@ import 'dart:convert';
 import 'package:crypto/crypto.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
-import 'package:http/http.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:provider/provider.dart';
 import 'dart:io';
 import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart';
-import 'package:smartfit_app_mobile/Modele/Api/request_api.dart';
 import 'package:smartfit_app_mobile/Modele/manager_file.dart';
 import 'package:smartfit_app_mobile/Modele/user.dart';
-import 'package:smartfit_app_mobile/View/login/signup_view.dart';
+import 'package:smartfit_app_mobile/modele/api/request_api.dart';
 import 'package:tuple/tuple.dart';
 
 // ----------- File --------------- //
diff --git a/lib/common_widget/round_text_field.dart b/lib/common_widget/round_text_field.dart
index 006ab83..f93c6a2 100644
--- a/lib/common_widget/round_text_field.dart
+++ b/lib/common_widget/round_text_field.dart
@@ -1,5 +1,3 @@
-import 'dart:ffi';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index 2aad57e..77fdfa7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:smartfit_app_mobile/Modele/user.dart';
-import 'package:smartfit_app_mobile/View/login/signup_view.dart';
+import 'package:smartfit_app_mobile/modele/user.dart';
+import 'package:smartfit_app_mobile/view/login/signup_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 
 void main() {