Fix rest of API objects usage

Change the rest of API to use objects.<Object> vs
objects.<module>.<Object>.

Partial-Blueprint: object-subclassing

Change-Id: I04db37c21547184f5aeb970e69547d6210be0c3e
Merge "Fix rest of API objects usage"