Reorganize make.conf