MAJOR refactor.

Recreating the classes by revering the ties with bad past.
Getting rid of GameWorld dependency
Still WIP…