Big cleanup of the build structure.