Removed include dir; trying the submodule thing.
Updated to use submodules.