A few Makefile fixes
Include modifications

Modify includes for the name/directory structure changes.  Everything compiles now! :D