Reverted to single makefile