Reorg and cleanup