cleaned include dir, renamed a few files.