Change sort representation to class (do not review yet)

Testing...
You should name this one sort and the other one NonTerminal.