reorg to prepare for python scripts