Reworked the makefile, pulling into the root dir.