Moved DataObject/DataCollection heirarchy into core unit and split them up into more logical file groupings.