Restructure setup.