GW2Client refactor