Cleaner layout. Consolidate functionality into run.sh.