Lots more reorganising
More reorg and rewriting