Revert "Unify makefiles"