Refactored the Appointments package