Added Services, moved controllers, added deletion choices