Removed include directory; merged header files in lib.