Change sorting

Similarly to filtering, make the controller responsible for sorting.  Do not mix in Sorting module into models, remove it completely.