VIVO-773 clean up the structure of the model makers