Reorg and first stab at bench running script