Split out yang-model-ri