reorg and cleanup