cleanup and reorg scripts