Updated the makefile

Makefile now works with the updated folder structure.