Refactor to move from openecomp to onap