Add Repos, refactor services to be cleaner