Restructuring the build.