Rough split of API methods into separate classes according to entity
Work to objectify wrapped entities
Shorten method name
Update tests to work with segmented objects API