Convert services.yml to .xml, clean up