np namespacing all service definitions, fixing syntax errors.