#6 IPortCriteria source artefact moved to the correct package