Re-arranged some things in the inventory to take account of dev, staging and prod