Added UserService and cleaned up other services to look more generic.