Removed include dir in prep for submodule.
Updated Makefile to use submodules, etc.