Added Word class, for query/pattern representing a word.
Further integration of new Word class.