Renamed the service class and all references to it to match the new module name
Moved service manifest
Merge pull request #27 from codesplicer/service-management-fixes

Service management fixes