-import org.openecomp.aai.champ.model.fluent.schema.CreateChampSchemable;
-import org.openecomp.aai.champ.model.fluent.schema.impl.CreateChampSchemableImpl;
+import org.onap.aai.champ.model.fluent.schema.CreateChampSchemable;
+import org.onap.aai.champ.model.fluent.schema.impl.CreateChampSchemableImpl;
+
+import java.util.Optional;