Get back my old makefile organization, because I love it