Move object classes out to common module.