Move DTO and refactor pharmacy / admin areas