Restructure the setup/ directory