Cleaned makefiles
Makefile improvements