diff --git a/Frontend/patient_manager/lib/components/addOrViewPatient.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
similarity index 94%
rename from Frontend/patient_manager/lib/components/addOrViewPatient.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
index 7be0be1e..8586d688 100644
--- a/Frontend/patient_manager/lib/components/addOrViewPatient.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart
@@ -6,8 +6,8 @@ import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
 import 'package:patient_manager/objects/patients.dart';
-import 'package:patient_manager/MIH_Packages/patientAdd.dart';
-import 'package:patient_manager/MIH_Packages/patientView.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/patientAdd.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/patientView.dart';
 import 'package:supertokens_flutter/http.dart' as http;
 
 class AddOrViewPatient extends StatefulWidget {
diff --git a/Frontend/patient_manager/lib/components/builders/BuildFileView.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/BuildFileView.dart
similarity index 100%
rename from Frontend/patient_manager/lib/components/builders/BuildFileView.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/BuildFileView.dart
diff --git a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
similarity index 99%
rename from Frontend/patient_manager/lib/components/builders/buildFilesList.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
index 96db2cd6..8384e7d0 100644
--- a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/components/builders/BuildFileView.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/builder/BuildFileView.dart';
 import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart';
 import 'package:patient_manager/components/popUpMessages/mihDeleteMessage.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
diff --git a/Frontend/patient_manager/lib/components/builders/buildNotesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart
similarity index 100%
rename from Frontend/patient_manager/lib/components/builders/buildNotesList.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart
diff --git a/Frontend/patient_manager/lib/MIH_Packages/fullScreenFile.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/fullScreenFile.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Packages/fullScreenFile.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/fullScreenFile.dart
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patientAdd.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Packages/patientAdd.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart
diff --git a/Frontend/patient_manager/lib/components/patientDetails.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart
similarity index 100%
rename from Frontend/patient_manager/lib/components/patientDetails.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patientEdit.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart
similarity index 100%
rename from Frontend/patient_manager/lib/MIH_Packages/patientEdit.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart
diff --git a/Frontend/patient_manager/lib/components/patientFiles.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
similarity index 99%
rename from Frontend/patient_manager/lib/components/patientFiles.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
index 585a24bf..b7a8de47 100644
--- a/Frontend/patient_manager/lib/components/patientFiles.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:patient_manager/components/builders/buildFilesList.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildFilesList.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihFileInput.dart';
 import 'package:patient_manager/components/medCertInput.dart';
 import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart';
@@ -21,7 +21,7 @@ import 'package:supertokens_flutter/http.dart' as http;
 import 'package:http/http.dart' as http2;
 import 'package:supertokens_flutter/supertokens.dart';
 
-import '../objects/patients.dart';
+import '../../objects/patients.dart';
 
 class PatientFiles extends StatefulWidget {
   final int patientIndex;
diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
similarity index 99%
rename from Frontend/patient_manager/lib/components/patientNotes.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
index 0e2d8318..064f9985 100644
--- a/Frontend/patient_manager/lib/components/patientNotes.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/components/builders/buildNotesList.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildNotesList.dart';
 import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart';
 import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart';
 import 'package:patient_manager/components/inputsAndButtons/mihMLTextInput.dart';
diff --git a/Frontend/patient_manager/lib/MIH_Packages/patientView.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
similarity index 95%
rename from Frontend/patient_manager/lib/MIH_Packages/patientView.dart
rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
index 2c40cb34..68869fc9 100644
--- a/Frontend/patient_manager/lib/MIH_Packages/patientView.dart
+++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:patient_manager/components/patientDetails.dart';
-import 'package:patient_manager/components/patientFiles.dart';
-import 'package:patient_manager/components/patientNotes.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/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
diff --git a/Frontend/patient_manager/lib/router/routeGenerator.dart b/Frontend/patient_manager/lib/router/routeGenerator.dart
index 42aae4f5..5ec46d15 100644
--- a/Frontend/patient_manager/lib/router/routeGenerator.dart
+++ b/Frontend/patient_manager/lib/router/routeGenerator.dart
@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:patient_manager/Authentication/authCheck.dart';
-import 'package:patient_manager/components/addOrViewPatient.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/addOrViewPatient.dart';
 import 'package:patient_manager/objects/appUser.dart';
 import 'package:patient_manager/objects/arguments.dart';
 import 'package:patient_manager/MIH_Packages/about_MIH/MIH_About.dart';
 import 'package:patient_manager/MIH_Packages/authentication/forgotPassword.dart';
 import 'package:patient_manager/MIH_Packages/authentication/resetPassword.dart';
-import 'package:patient_manager/MIH_Packages/fullScreenFile.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/fullScreenFile.dart';
 import 'package:patient_manager/MIH_Packages/manageBusinessProfile.dart';
 import 'package:patient_manager/MIH_Packages/access_review/patientAccessReview.dart';
-import 'package:patient_manager/MIH_Packages/patientAdd.dart';
-import 'package:patient_manager/MIH_Packages/patientEdit.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/patientAdd.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/patientEdit.dart';
 import 'package:patient_manager/MIH_Packages/patientManager.dart';
-import 'package:patient_manager/MIH_Packages/patientView.dart';
+import 'package:patient_manager/MIH_Packages/patient_profile/patientView.dart';
 import 'package:patient_manager/MIH_Packages/profileBusinessAdd.dart';
 import 'package:patient_manager/MIH_Packages/profileBusinessUpdate.dart';
 import 'package:patient_manager/MIH_Packages/mzansi_profile/profileUserUpdate.dart';