Add missing services.
Fix namespaces and sort usings.