Updates

Renamed a number of scripts, and tried to re-order the demo process.