(subdirs): Reorganize order so that nss follows add-ons.