Merged projects with makefile fix

Makefile was still using the HFD parameters. Also, merged changes made yesterday to fit in with new file structure.