Sort groups and entries

#12