Some changes to directory structure of repo
Modified run.sh for easier debugging.
Made run.sh a bit easier to read.