Modularized the build.