Refactored game types into logic classes