Moving services to align with .NET