Even more massive updates to control.sh -- handle the structuring better