Refactored classes
Merge branch 'master' of https://github.com/savtech/Wordz.git