Fixed Class Structures

Removed reference to things that should be going through game, and
removed variables from classes that weren't a state it held.