Add Screen class and clean up GameScreen