Update Makefiles can now compile each subfile

Fixes makefile to new system