Reorg scripts for general purpose