cleaned up makefiles
more rework