Refactor

Renamed 'gameState' objects to 'Screen' objects and rewrote interface