Move object definitions into separate files