Refactoring packages and adding AppointmentTest class