Adds Enumeration GameModeType in clean way

Hope to see only the related changes now in this pull request
Why have you swapped the import order? What style are you using?