redo models relationships from embedded to one to many