Restructure setup script a bit