Cleanup makefiles into a single Makefile