Rework all Makefiles