diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart
index 77d5f8ab..a1ef39b8 100644
--- a/Frontend/lib/main.dart
+++ b/Frontend/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'mih_config/mih_env.dart';
-import '../mih_router/routeGenerator.dart';
-import '../mih_theme/mih_theme.dart';
+import 'mih_config/mih_routeGenerator.dart';
+import 'mih_config/mih_theme.dart';
 
 class MzanziInnovationHub extends StatefulWidget {
   const MzanziInnovationHub({
diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart
index db98a3e0..c52de9ee 100644
--- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart
+++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_api.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_apis.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart
index ee7d5f6d..42f0de70 100644
--- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart
+++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart
@@ -1,5 +1,5 @@
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_apis.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart
index 03427363..03c2cfab 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart
@@ -1,7 +1,7 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_api.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_icd10_code_api.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_icd10_code_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart';
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart
index 2c220f9a..1d05cea5 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:fl_downloader/fl_downloader.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_api.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_api.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
index 41ec35ea..8d46a8a0 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_api.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
diff --git a/Frontend/lib/mih_services/mih_business_details_apis.dart b/Frontend/lib/mih_services/mih_business_details_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_business_details_apis.dart
rename to Frontend/lib/mih_services/mih_business_details_services.dart
diff --git a/Frontend/lib/mih_services/mih_claim_statement_generation_api.dart b/Frontend/lib/mih_services/mih_claim_statement_generation_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_claim_statement_generation_api.dart
rename to Frontend/lib/mih_services/mih_claim_statement_generation_services.dart
diff --git a/Frontend/lib/mih_services/mih_file_api.dart b/Frontend/lib/mih_services/mih_file_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_file_api.dart
rename to Frontend/lib/mih_services/mih_file_services.dart
diff --git a/Frontend/lib/mih_services/mih_icd10_code_api.dart b/Frontend/lib/mih_services/mih_icd10_code_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_icd10_code_api.dart
rename to Frontend/lib/mih_services/mih_icd10_code_services.dart
diff --git a/Frontend/lib/mih_services/mih_location_api.dart b/Frontend/lib/mih_services/mih_location_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_location_api.dart
rename to Frontend/lib/mih_services/mih_location_services.dart
diff --git a/Frontend/lib/mih_services/mih_my_business_user_apis.dart b/Frontend/lib/mih_services/mih_my_business_user_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_my_business_user_apis.dart
rename to Frontend/lib/mih_services/mih_my_business_user_services.dart
diff --git a/Frontend/lib/mih_services/mih_mzansi_calendar_apis.dart b/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart
similarity index 99%
rename from Frontend/lib/mih_services/mih_mzansi_calendar_apis.dart
rename to Frontend/lib/mih_services/mih_mzansi_calendar_services.dart
index 0ab3febf..2a4639b2 100644
--- a/Frontend/lib/mih_services/mih_mzansi_calendar_apis.dart
+++ b/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:mzansi_innovation_hub/mih_services/mih_notification_apis.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_notification_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart';
diff --git a/Frontend/lib/mih_services/mih_mzansi_wallet_apis.dart b/Frontend/lib/mih_services/mih_mzansi_wallet_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_mzansi_wallet_apis.dart
rename to Frontend/lib/mih_services/mih_mzansi_wallet_services.dart
diff --git a/Frontend/lib/mih_services/mih_notification_apis.dart b/Frontend/lib/mih_services/mih_notification_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_notification_apis.dart
rename to Frontend/lib/mih_services/mih_notification_services.dart
diff --git a/Frontend/lib/mih_services/mih_api_calls.dart b/Frontend/lib/mih_services/mih_service_calls.dart
similarity index 99%
rename from Frontend/lib/mih_services/mih_api_calls.dart
rename to Frontend/lib/mih_services/mih_service_calls.dart
index 988324cf..4a7da538 100644
--- a/Frontend/lib/mih_services/mih_api_calls.dart
+++ b/Frontend/lib/mih_services/mih_service_calls.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:mzansi_innovation_hub/mih_services/mih_file_api.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_notification_apis.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_notification_services.dart';
 import 'package:flutter/material.dart';
 // import '../mih_components/mih_pop_up_messages/mih_error_message.dart';
 // import '../mih_components/mih_pop_up_messages/mih_success_message.dart';
diff --git a/Frontend/lib/mih_services/mih_user_apis.dart b/Frontend/lib/mih_services/mih_user_services.dart
similarity index 100%
rename from Frontend/lib/mih_services/mih_user_apis.dart
rename to Frontend/lib/mih_services/mih_user_services.dart