Some reorganization around the build system.