Simplify Makefiles and make them more consistent