Added more to end of setup.sh
Moved setup.sh to setup folder