Refactor to move from openecomp to onap

No match.