Refactoring

Drastically changed the hierarchy of the game. Still doesn’t work
though.