Fixed namespacing, formatting
First pass at location service