Organise imports to ONAP Java standards