Change sort representation to class (do not review yet)

Testing...
Do you have any plans to remove this file? Because I think it should go away if you are doing this change.