diff --git a/Frontend/lib/mih_packages/appointment/appointments.dart b/Frontend/lib/mih_packages/calendar/appointments.dart
similarity index 99%
rename from Frontend/lib/mih_packages/appointment/appointments.dart
rename to Frontend/lib/mih_packages/calendar/appointments.dart
index 88054f00..3898a0d7 100644
--- a/Frontend/lib/mih_packages/appointment/appointments.dart
+++ b/Frontend/lib/mih_packages/calendar/appointments.dart
@@ -9,7 +9,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_bo
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:Mzansi_Innovation_Hub/mih_objects/appointment.dart';
 import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
-import 'package:Mzansi_Innovation_Hub/mih_packages/appointment/builder/build_appointment_list.dart';
+import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/builder/build_appointment_list.dart';
 import 'package:flutter/material.dart';
 import '../../main.dart';
 
diff --git a/Frontend/lib/mih_packages/appointment/builder/build_access_request_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart
similarity index 100%
rename from Frontend/lib/mih_packages/appointment/builder/build_access_request_list.dart
rename to Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart
diff --git a/Frontend/lib/mih_packages/appointment/builder/build_appointment_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart
similarity index 100%
rename from Frontend/lib/mih_packages/appointment/builder/build_appointment_list.dart
rename to Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart
diff --git a/Frontend/lib/mih_packages/appointment/builder/build_queue_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart
similarity index 100%
rename from Frontend/lib/mih_packages/appointment/builder/build_queue_list.dart
rename to Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart
diff --git a/Frontend/lib/mih_packages/appointment/mzansi_calendar.dart b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart
similarity index 84%
rename from Frontend/lib/mih_packages/appointment/mzansi_calendar.dart
rename to Frontend/lib/mih_packages/calendar/mzansi_calendar.dart
index 2ca03290..116db3d5 100644
--- a/Frontend/lib/mih_packages/appointment/mzansi_calendar.dart
+++ b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart
@@ -1,16 +1,15 @@
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_action.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tools.dart';
-import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart';
 import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
-import 'package:Mzansi_Innovation_Hub/mih_packages/appointment/appointments.dart';
+import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/appointments.dart';
 import 'package:flutter/material.dart';
 
 class MzansiCalendar extends StatefulWidget {
-  final AppUser signedInUser;
+  final CalendarArguments arguments;
   const MzansiCalendar({
     super.key,
-    required this.signedInUser,
+    required this.arguments,
   });
 
   @override
@@ -44,7 +43,7 @@ class _MzansiCalendarState extends State<MzansiCalendar> {
         Navigator.of(context).pop();
         Navigator.of(context).popAndPushNamed(
           '/',
-          arguments: AuthArguments(true, false),
+          arguments: AuthArguments(widget.arguments.personalSelected, false),
         );
       },
     );
@@ -67,7 +66,7 @@ class _MzansiCalendarState extends State<MzansiCalendar> {
   List<Widget> getToolBody() {
     List<Widget> toolBodies = [
       //appointment here
-      Appointments(signedInUser: widget.signedInUser),
+      Appointments(signedInUser: widget.arguments.signedInUser),
     ];
     return toolBodies;
   }