Yet more cleanup + reorg