Cleaned up Game1, added a World class, added ControlState, further cleanup