Changed module list to sort by plugin, then by name