Added namespacing and refactored service definition objects

Refactoring for consistency on object for standard fields and service
definitions