Reorder instance definitions to make more sense