Move all services to DI container