Refactor and splitted Day/Appointments