Enormous refactoring v2.
Forgot to include the WordList class.

Signed-off-by: szeren <szeren@66-152-109-60.tvc-ip.com>