Code refactoring
Word and Char structures added