Restructured make.