Bug-22 Add Word and WordStorage class