Change to best practice on Makefile design
Moving makefile to top level dir