diff --git a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart
index 97d619bb..0ffde2a9 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/MIH_Packages/MIH_Home/homeTileGrid.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart
index 1fabd50d..d172282c 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_nav_bar/google_nav_bar.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_tile.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_search_input.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_app_drawer.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihWarningMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_tile.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_app_drawer.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihDeleteMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihWarningMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart b/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart
index 6ffadf0a..c0c884f5 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_layout_builder.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_tile.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_layout_builder.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_tile.dart';
 import 'package:patient_manager/main.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
diff --git a/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart b/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart
index 38be1a5f..ddf007c6 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/accessRequest.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart b/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart
index 8d2776f6..e47a90c0 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_layout_builder.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_layout_builder.dart';
 import 'package:patient_manager/MIH_Packages/access_review/builder/buildAccessRequestList.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/accessRequest.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart
index 7d1aa16b..4cdc1612 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart
index add1b8f4..9888ff52 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart
@@ -2,12 +2,12 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_pass_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_pass_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 //import 'package:patient_manager/objects/sessionST.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart
index 79a5d845..7471642b 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_pass_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_pass_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart
index 5701356f..e088303d 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart
@@ -2,12 +2,12 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_tile.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_pass_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_tile.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_pass_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart
index 3646e369..32d566e3 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihDeleteMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart
index 69e8c5ae..5110bec2 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart
index a67c5fc4..c7bfcd4a 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart
@@ -3,13 +3,13 @@ import 'dart:convert';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_file_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart
index f5a19ded..d520b7fd 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart
@@ -3,16 +3,16 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/MIH_Packages/manage_business/businessDetails.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_layout_builder.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_layout_builder.dart';
 import 'package:patient_manager/MIH_Packages/manage_business/builder/buildEmployeeList.dart';
 import 'package:patient_manager/MIH_Packages/manage_business/builder/buildUserList.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_search_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart
index 83472c80..2c06ba08 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart
@@ -2,13 +2,13 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_file_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart b/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart
index 7204a66c..b67bf4e6 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart
@@ -3,16 +3,16 @@ import 'dart:convert';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_layout_builder.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_file_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_layout_builder.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
index 74b2b487..1daddb8b 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
index 3e6d092b..9c6e325c 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/BuildFileView.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihDeleteMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart
index ace98a14..8c83245e 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart
@@ -1,11 +1,11 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_multiline_text_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihDeleteMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart
index a5759519..8913e4c3 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_date_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_time_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_date_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_time_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
@@ -184,13 +184,13 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
                     const SizedBox(height: 10.0),
                     MIHDateField(
                       controller: dateController,
-                      LableText: "Date",
+                      lableText: "Date",
                       required: true,
                     ),
                     const SizedBox(height: 10.0),
                     MIHTimeField(
                       controller: timeController,
-                      LableText: "Time",
+                      lableText: "Time",
                       required: true,
                     ),
                     const SizedBox(height: 30.0),
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart
index 45a22c73..4b5e06d5 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihWarningMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihWarningMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart
index 5cbcaf6d..5c6952c4 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart
@@ -2,12 +2,12 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
 //import 'package:patient_manager/MIH_Components/mihAppDrawer.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart
index ddc06cf7..bc9b5728 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart
index 6dec1e04..50e74e30 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
index bb9bf30a..4c7a2d25 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
@@ -4,12 +4,12 @@ import 'dart:convert';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildFilesList.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_file_input.dart';
-import 'package:patient_manager/MIH_Components/medCertInput.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
+import 'package:patient_manager/mih_components/medCertInput.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/prescipInput.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart
index c103314b..2bdcf2cb 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart
@@ -6,13 +6,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildPatientList.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_date_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_date_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
 import 'package:patient_manager/objects/arguments.dart';
 import 'package:patient_manager/objects/patientQueue.dart';
 import 'package:supertokens_flutter/http.dart' as http;
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_search_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/patients.dart';
@@ -314,7 +314,7 @@ class _PatientManagerState extends State<PatientManager> {
         const SizedBox(height: 10),
         MIHDateField(
           controller: queueDateController,
-          LableText: "Date",
+          lableText: "Date",
           required: true,
         ),
         //spacer
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
index 69af7fd6..043edc22 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
@@ -2,12 +2,12 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildNotesList.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_multiline_text_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_text_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
index 8c512314..df99f7f4 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/patientDetails.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/patientFiles.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/patientNotes.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_layout_builder.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_layout_builder.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart
index 4a50c00e..9c2c0c7e 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart
@@ -2,13 +2,13 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:patient_manager/MIH_Components/medicineSearch.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_dropdown_input.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_search_input.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart';
+import 'package:patient_manager/mih_components/medicineSearch.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihSuccessMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/appUser.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_action.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_action.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_action.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_action.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_app_drawer.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_app_drawer.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_app_drawer.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_app_drawer.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_body.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_body.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_body.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_body.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_header.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_header.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_header.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_header.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_layout_builder.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_layout_builder.dart
similarity index 86%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_layout_builder.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_layout_builder.dart
index f895c634..75619510 100644
--- a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_layout_builder.dart
+++ b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_layout_builder.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_action.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_body.dart';
-import 'package:patient_manager/MIH_Components/MIH_Layout/mih_header.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_action.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_body.dart';
+import 'package:patient_manager/mih_components/MIH_Layout/mih_header.dart';
 
 class MIHLayoutBuilder extends StatefulWidget {
   final MIHAction actionButton;
diff --git a/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_tile.dart b/Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_tile.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/MIH_Layout/mih_tile.dart
rename to Frontend/patient_manager/lib/mih_components/MIH_Layout/mih_tile.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/medCertInput.dart b/Frontend/patient_manager/lib/mih_components/medCertInput.dart
similarity index 87%
rename from Frontend/patient_manager/lib/MIH_Components/medCertInput.dart
rename to Frontend/patient_manager/lib/mih_components/medCertInput.dart
index 2b6f9bee..4ccc12dc 100644
--- a/Frontend/patient_manager/lib/MIH_Components/medCertInput.dart
+++ b/Frontend/patient_manager/lib/mih_components/medCertInput.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_date_input.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_date_input.dart';
 
 class Medcertinput extends StatefulWidget {
   final startDateController;
@@ -34,7 +34,7 @@ class _MedcertinputState extends State<Medcertinput> {
             width: 700,
             child: MIHDateField(
               controller: widget.startDateController,
-              LableText: "From",
+              lableText: "From",
               required: true,
             ),
           ),
@@ -43,7 +43,7 @@ class _MedcertinputState extends State<Medcertinput> {
             width: 700,
             child: MIHDateField(
               controller: widget.endDateTextController,
-              LableText: "Up to Including",
+              lableText: "Up to Including",
               required: true,
             ),
           ),
@@ -52,7 +52,7 @@ class _MedcertinputState extends State<Medcertinput> {
             width: 700,
             child: MIHDateField(
               controller: widget.retDateTextController,
-              LableText: "Return",
+              lableText: "Return",
               required: true,
             ),
           ),
diff --git a/Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart b/Frontend/patient_manager/lib/mih_components/medicineSearch.dart
similarity index 96%
rename from Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart
rename to Frontend/patient_manager/lib/mih_components/medicineSearch.dart
index 71b44a85..0ac49b8d 100644
--- a/Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart
+++ b/Frontend/patient_manager/lib/mih_components/medicineSearch.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildMedList.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart';
-import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihLoadingCircle.dart';
+import 'package:patient_manager/mih_components/mih_pop_up_messages/mihErrorMessage.dart';
 import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/medicine.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_button.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_button.dart
similarity index 97%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_button.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_button.dart
index 2a419c74..012b4dc0 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_button.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_button.dart
@@ -21,7 +21,6 @@ class MIHButton extends StatefulWidget {
 class _MIHButtonState extends State<MIHButton> {
   @override
   void dispose() {
-    // TODO: implement dispose
     super.dispose();
   }
 
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_date_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_date_input.dart
similarity index 92%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_date_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_date_input.dart
index 8f91e42e..c9c31d8e 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_date_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_date_input.dart
@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:patient_manager/main.dart';
 
 class MIHDateField extends StatefulWidget {
-  final controller;
-  final String LableText;
+  final TextEditingController controller;
+  final String lableText;
   final bool required;
 
   const MIHDateField({
     super.key,
     required this.controller,
-    required this.LableText,
+    required this.lableText,
     required this.required,
   });
 
@@ -18,7 +18,7 @@ class MIHDateField extends StatefulWidget {
 }
 
 class _MIHDateFieldState extends State<MIHDateField> {
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
   bool startup = true;
   // bool makeEditable() {
   Future<void> _selectDate(BuildContext context) async {
@@ -48,14 +48,14 @@ class _MIHDateFieldState extends State<MIHDateField> {
           const SizedBox(
             width: 8.0,
           ),
-          Text(widget.LableText,
+          Text(widget.lableText,
               style: TextStyle(
                   color:
                       MzanziInnovationHub.of(context)!.theme.secondaryColor())),
         ],
       );
     } else {
-      return Text(widget.LableText,
+      return Text(widget.lableText,
           style: TextStyle(
               color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
     }
@@ -76,7 +76,7 @@ class _MIHDateFieldState extends State<MIHDateField> {
       return null;
     }
     if (text.isEmpty) {
-      return "${widget.LableText} is required";
+      return "${widget.lableText} is required";
     }
     return null;
   }
@@ -111,7 +111,7 @@ class _MIHDateFieldState extends State<MIHDateField> {
             color: MzanziInnovationHub.of(context)!.theme.errorColor(),
             fontWeight: FontWeight.bold),
         label: setRequiredText(),
-        //labelText: widget.LableText,
+        //labelText: widget.lableText,
         //labelStyle: const TextStyle(color: Colors.blueAccent),
         prefixIcon: Icon(
           Icons.calendar_today,
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_dropdown_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart
similarity index 99%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_dropdown_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart
index 28c8e4d7..72f228b8 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_dropdown_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart
@@ -27,7 +27,7 @@ class _MIHDropdownFieldState extends State<MIHDropdownField> {
   //var dropbownItems = ["Dr.", "Assistant"];
   bool startup = true;
   final FocusNode _focus = FocusNode();
-  late var menu;
+  late List<DropdownMenuEntry<String>> menu;
 
   Widget setRequiredText() {
     if (widget.required) {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_file_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_file_input.dart
similarity index 91%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_file_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_file_input.dart
index 18d87e6d..c305cfc2 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_file_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_file_input.dart
@@ -23,7 +23,7 @@ class MIHFileField extends StatefulWidget {
 
 class _MIHFileFieldState extends State<MIHFileField> {
   bool startup = true;
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
 
   bool makeEditable() {
     if (widget.editable) {
@@ -35,7 +35,7 @@ class _MIHFileFieldState extends State<MIHFileField> {
 
   String? get _errorText {
     final text = widget.controller.text;
-    String _errorMessage = '';
+    String errorMessage = '';
     if (startup) {
       return null;
     }
@@ -46,24 +46,24 @@ class _MIHFileFieldState extends State<MIHFileField> {
       return "${widget.hintText} is required";
     }
     if (widget.hintText == "Email" && !isEmailValid(text)) {
-      _errorMessage += "Enter a valid email address\n";
+      errorMessage += "Enter a valid email address\n";
     }
     if (widget.hintText == "Username" && text.length < 8) {
-      _errorMessage += "• Username must contain at least 8 characters.\n";
+      errorMessage += "• Username must contain at least 8 characters.\n";
     }
     if (widget.hintText == "Username" && !isUsernameValid(text)) {
-      _errorMessage += "• Username can only contain '_' special Chracters.\n";
+      errorMessage += "• Username can only contain '_' special Chracters.\n";
     }
-    if (_errorMessage.isEmpty) {
+    if (errorMessage.isEmpty) {
       return null;
     }
     // If there are no error messages, the password is valid
-    return _errorMessage;
+    return errorMessage;
   }
 
-  bool isUsernameValid(String Username) {
+  bool isUsernameValid(String username) {
     return RegExp(r'^(?=[a-zA-Z0-9._]{8,20}$)(?!.*[_.]{2})[^_.].*[^_.]$')
-        .hasMatch(Username);
+        .hasMatch(username);
   }
 
   bool isEmailValid(String email) {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_multiline_text_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart
similarity index 97%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_multiline_text_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart
index 2192322c..da47eb21 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_multiline_text_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:patient_manager/main.dart';
 
 class MIHMLTextField extends StatefulWidget {
-  final controller;
+  final TextEditingController controller;
   final String hintText;
   final bool editable;
   final bool required;
@@ -21,7 +21,7 @@ class MIHMLTextField extends StatefulWidget {
 
 class _MIHMLTextFieldState extends State<MIHMLTextField> {
   bool startup = true;
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
 
   bool makeEditable() {
     if (widget.editable) {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_pass_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_pass_input.dart
similarity index 92%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_pass_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_pass_input.dart
index 5db680e4..1f9a1e24 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_pass_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_pass_input.dart
@@ -38,7 +38,7 @@ class _MIHPassFieldState extends State<MIHPassField> {
 
   String? get _errorText {
     final text = widget.controller.text;
-    String _errorMessage = '';
+    String errorMessage = '';
     if (startup) {
       return null;
     }
@@ -50,35 +50,35 @@ class _MIHPassFieldState extends State<MIHPassField> {
     }
     // Password length greater than 8
     if (text.length <= 8 && !widget.signIn) {
-      _errorMessage += '• Password must contain at least 8 characters.\n';
+      errorMessage += '• Password must contain at least 8 characters.\n';
     }
 
     // Contains at least one uppercase letter
     if (!text.contains(RegExp(r'[A-Z]')) && !widget.signIn) {
-      _errorMessage += '• Uppercase letter is missing.\n';
+      errorMessage += '• Uppercase letter is missing.\n';
     }
 
     // Contains at least one lowercase letter
     if (!text.contains(RegExp(r'[a-z]')) && !widget.signIn) {
-      _errorMessage += '• Lowercase letter is missing.\n';
+      errorMessage += '• Lowercase letter is missing.\n';
     }
 
     // Contains at least one digit
     if (!text.contains(RegExp(r'[0-9]')) && !widget.signIn) {
-      _errorMessage += '• number is missing.\n';
+      errorMessage += '• number is missing.\n';
     }
 
     // Contains at least one special character
     if (!text.contains(RegExp(r'[!@#$%^&*]')) && !widget.signIn) {
-      _errorMessage += '• Special character is missing - !@#\$%^&*\n';
+      errorMessage += '• Special character is missing - !@#\$%^&*\n';
     }
 
     // Contains no errors
-    if (_errorMessage.isEmpty) {
+    if (errorMessage.isEmpty) {
       return null;
     }
     // If there are no error messages, the password is valid
-    return _errorMessage;
+    return errorMessage;
   }
 
   Widget setRequiredText() {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_search_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_search_input.dart
similarity index 99%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_search_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_search_input.dart
index 2261e395..c840265e 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_search_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_search_input.dart
@@ -23,7 +23,7 @@ class MIHSearchField extends StatefulWidget {
 
 class _MIHSearchFieldState extends State<MIHSearchField> {
   bool startup = true;
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
 
   bool makeEditable() {
     if (widget.editable) {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_text_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_text_input.dart
similarity index 91%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_text_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_text_input.dart
index 29467a3b..a2f0c186 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_text_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_text_input.dart
@@ -21,7 +21,7 @@ class MIHTextField extends StatefulWidget {
 
 class _MIHTextFieldState extends State<MIHTextField> {
   bool startup = true;
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
 
   bool makeEditable() {
     if (widget.editable) {
@@ -33,7 +33,7 @@ class _MIHTextFieldState extends State<MIHTextField> {
 
   String? get _errorText {
     final text = widget.controller.text;
-    String _errorMessage = '';
+    String errorMessage = '';
     if (startup) {
       return null;
     }
@@ -44,24 +44,24 @@ class _MIHTextFieldState extends State<MIHTextField> {
       return "${widget.hintText} is required";
     }
     if (widget.hintText == "Email" && !isEmailValid(text)) {
-      _errorMessage += "Enter a valid email address\n";
+      errorMessage += "Enter a valid email address\n";
     }
     if (widget.hintText == "Username" && text.length < 8) {
-      _errorMessage += "• Username must contain at least 8 characters.\n";
+      errorMessage += "• Username must contain at least 8 characters.\n";
     }
     if (widget.hintText == "Username" && !isUsernameValid(text)) {
-      _errorMessage += "• Username can only contain '_' special Chracters.\n";
+      errorMessage += "• Username can only contain '_' special Chracters.\n";
     }
-    if (_errorMessage.isEmpty) {
+    if (errorMessage.isEmpty) {
       return null;
     }
     // If there are no error messages, the password is valid
-    return _errorMessage;
+    return errorMessage;
   }
 
-  bool isUsernameValid(String Username) {
+  bool isUsernameValid(String username) {
     return RegExp(r'^(?=[a-zA-Z0-9._]{8,20}$)(?!.*[_.]{2})[^_.].*[^_.]$')
-        .hasMatch(Username);
+        .hasMatch(username);
   }
 
   bool isEmailValid(String email) {
diff --git a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_time_input.dart b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_time_input.dart
similarity index 93%
rename from Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_time_input.dart
rename to Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_time_input.dart
index a791642a..1413fb78 100644
--- a/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mih_time_input.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_inputs_and_buttons/mih_time_input.dart
@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:patient_manager/main.dart';
 
 class MIHTimeField extends StatefulWidget {
-  final controller;
-  final String LableText;
+  final TextEditingController controller;
+  final String lableText;
   final bool required;
 
   const MIHTimeField({
     super.key,
     required this.controller,
-    required this.LableText,
+    required this.lableText,
     required this.required,
   });
 
@@ -18,7 +18,7 @@ class MIHTimeField extends StatefulWidget {
 }
 
 class _MIHDateFieldState extends State<MIHTimeField> {
-  FocusNode _focus = FocusNode();
+  final FocusNode _focus = FocusNode();
   bool startup = true;
 
   Future<void> _selectTime(BuildContext context) async {
@@ -66,14 +66,14 @@ class _MIHDateFieldState extends State<MIHTimeField> {
           const SizedBox(
             width: 8.0,
           ),
-          Text(widget.LableText,
+          Text(widget.lableText,
               style: TextStyle(
                   color:
                       MzanziInnovationHub.of(context)!.theme.secondaryColor())),
         ],
       );
     } else {
-      return Text(widget.LableText,
+      return Text(widget.lableText,
           style: TextStyle(
               color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
     }
@@ -94,7 +94,7 @@ class _MIHDateFieldState extends State<MIHTimeField> {
       return null;
     }
     if (text.isEmpty) {
-      return "${widget.LableText} is required";
+      return "${widget.lableText} is required";
     }
     return null;
   }
@@ -129,7 +129,7 @@ class _MIHDateFieldState extends State<MIHTimeField> {
             color: MzanziInnovationHub.of(context)!.theme.errorColor(),
             fontWeight: FontWeight.bold),
         label: setRequiredText(),
-        //labelText: widget.LableText,
+        //labelText: widget.lableText,
         //labelStyle: const TextStyle(color: Colors.blueAccent),
         prefixIcon: Icon(
           Icons.access_alarm,
diff --git a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihDeleteMessage.dart
similarity index 99%
rename from Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart
rename to Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihDeleteMessage.dart
index 33e54b7a..80a08da2 100644
--- a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihDeleteMessage.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/main.dart';
 
 class MIHDeleteMessage extends StatefulWidget {
diff --git a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihErrorMessage.dart b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihErrorMessage.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihErrorMessage.dart
rename to Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihErrorMessage.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihLoadingCircle.dart b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihLoadingCircle.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihLoadingCircle.dart
rename to Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihLoadingCircle.dart
diff --git a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihSuccessMessage.dart
similarity index 97%
rename from Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart
rename to Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihSuccessMessage.dart
index a7a4b7d4..50f0f075 100644
--- a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart
+++ b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihSuccessMessage.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:patient_manager/MIH_Components/inputsAndButtons/mih_button.dart';
+import 'package:patient_manager/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:patient_manager/main.dart';
 
 class MIHSuccessMessage extends StatefulWidget {
diff --git a/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihWarningMessage.dart b/Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihWarningMessage.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihWarningMessage.dart
rename to Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mihWarningMessage.dart