Update to use new ONAP directory