Consolidate added to nom packages, reordering the nom packages