reorder model setup so they can be loaded properly