Completed conversion of Services and Repositories.