Merge "Move VNF-Onboarding classes into a separate directory"