Finshed reorg ; we now have a seperated step for the schema definition