Moved include files to top-most directory, and updated makefile to match new layout