Refactor services to not be singletons