Fixed up setup.sh and redid the folder structure.