Switched to new Makefile layout