Reorganized makefiles