Move b/c code for ReferenceObject to a better location

Change-Id: I2c41f79eea155ec1ad9626cc25a169c3ba27cf7d
Move b/c code for ClaimObject and StatementObject to a better location

Change-Id: Ibbf4c1068a57ac96dca397a3305070126e07091d
Merge changes Ibbf4c106,I2c41f79e

* changes:
  Move b/c code for ClaimObject and StatementObject to a better location
  Move b/c code for ReferenceObject to a better location