Rework main Makefiles