Match our Objects api

Change-Id: Iac03a661dedb9026445f962b2fcbea5cf795ca51
Fix package directory

Change-Id: Id06875916b5e050a4b7630ae63fc5880ce8f55cd