Updated setup script for the re-org.