Fixes makefiles, the recursive makefile also works. We can consolidate down to a single folder if needed.