Fixed Makefile once and for all
Removed subdirectory Makefile