Changed to a single makefile