moved some files around in setup.sh