Add Services, refactor controllers