Restructured the build.