Merge "Create Service and ServiceManager classes"