reorg scripts out to base