diff --git a/pom.xml b/pom.xml
index 659242c..5d4c59c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- gr.cite.opendmp
+ org.opencdmp
common-models
${revision}
jar
- OpenDMP Common Models
- OpenDMP Common Models
+ OpenCDMP Common Models
+ OpenCDMP Common Models
https://code-repo.d4science.org/MaDgiK-CITE/common-models
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java
deleted file mode 100644
index 40d8ff7..0000000
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
-
-public class LabelDataModel extends BaseFieldDataModel {
-
-}
diff --git a/src/main/java/eu/eudat/commonmodels/enums/ContactInfoType.java b/src/main/java/org/opencdmp/commonmodels/enums/ContactInfoType.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/ContactInfoType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/ContactInfoType.java
index 8ad3e97..b50d601 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/ContactInfoType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/ContactInfoType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DescriptionStatus.java b/src/main/java/org/opencdmp/commonmodels/enums/DescriptionStatus.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/DescriptionStatus.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DescriptionStatus.java
index 9f61fcb..4bfc382 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DescriptionStatus.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DescriptionStatus.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpAccessType.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpAccessType.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpAccessType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpAccessType.java
index ba19aa9..8598fa3 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpAccessType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpAccessType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintExtraFieldDataType.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintExtraFieldDataType.java
similarity index 94%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintExtraFieldDataType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintExtraFieldDataType.java
index 55d8858..4b5cf3f 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintExtraFieldDataType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintExtraFieldDataType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintFieldCategory.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintFieldCategory.java
similarity index 95%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintFieldCategory.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintFieldCategory.java
index d3f2ce8..7f6ff70 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintFieldCategory.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintFieldCategory.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintStatus.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintStatus.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintStatus.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintStatus.java
index af03f8a..89d9c17 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintStatus.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintStatus.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintSystemFieldType.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintSystemFieldType.java
similarity index 94%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintSystemFieldType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintSystemFieldType.java
index 9cf2bbd..6ed7203 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpBlueprintSystemFieldType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpBlueprintSystemFieldType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpStatus.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpStatus.java
similarity index 92%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpStatus.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpStatus.java
index d7a10b2..079e85b 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpStatus.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpStatus.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/DmpUserRole.java b/src/main/java/org/opencdmp/commonmodels/enums/DmpUserRole.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/DmpUserRole.java
rename to src/main/java/org/opencdmp/commonmodels/enums/DmpUserRole.java
index aac7acf..09869e1 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/DmpUserRole.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/DmpUserRole.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/EnumUtils.java b/src/main/java/org/opencdmp/commonmodels/enums/EnumUtils.java
similarity index 91%
rename from src/main/java/eu/eudat/commonmodels/enums/EnumUtils.java
rename to src/main/java/org/opencdmp/commonmodels/enums/EnumUtils.java
index 6b3db66..01cf5d0 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/EnumUtils.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/EnumUtils.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/EnumValueProvider.java b/src/main/java/org/opencdmp/commonmodels/enums/EnumValueProvider.java
similarity index 75%
rename from src/main/java/eu/eudat/commonmodels/enums/EnumValueProvider.java
rename to src/main/java/org/opencdmp/commonmodels/enums/EnumValueProvider.java
index b10d2fc..7ff9774 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/EnumValueProvider.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/EnumValueProvider.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/FieldType.java b/src/main/java/org/opencdmp/commonmodels/enums/FieldType.java
similarity index 98%
rename from src/main/java/eu/eudat/commonmodels/enums/FieldType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/FieldType.java
index 44a7011..0feb194 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/FieldType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/FieldType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/FieldValidationType.java b/src/main/java/org/opencdmp/commonmodels/enums/FieldValidationType.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/enums/FieldValidationType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/FieldValidationType.java
index b22c9cf..13eb53b 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/FieldValidationType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/FieldValidationType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/eu/eudat/commonmodels/enums/ReferenceSourceType.java b/src/main/java/org/opencdmp/commonmodels/enums/ReferenceSourceType.java
similarity index 92%
rename from src/main/java/eu/eudat/commonmodels/enums/ReferenceSourceType.java
rename to src/main/java/org/opencdmp/commonmodels/enums/ReferenceSourceType.java
index 2081fd6..4dedae4 100644
--- a/src/main/java/eu/eudat/commonmodels/enums/ReferenceSourceType.java
+++ b/src/main/java/org/opencdmp/commonmodels/enums/ReferenceSourceType.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.enums;
+package org.opencdmp.commonmodels.enums;
import java.util.Map;
diff --git a/src/main/java/eu/eudat/commonmodels/models/DescriptionTemplateTypeModel.java b/src/main/java/org/opencdmp/commonmodels/models/DescriptionTemplateTypeModel.java
similarity index 87%
rename from src/main/java/eu/eudat/commonmodels/models/DescriptionTemplateTypeModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/DescriptionTemplateTypeModel.java
index 08f2a62..288250b 100644
--- a/src/main/java/eu/eudat/commonmodels/models/DescriptionTemplateTypeModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/DescriptionTemplateTypeModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/DmpUserModel.java b/src/main/java/org/opencdmp/commonmodels/models/DmpUserModel.java
similarity index 79%
rename from src/main/java/eu/eudat/commonmodels/models/DmpUserModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/DmpUserModel.java
index 4a05646..d58759e 100644
--- a/src/main/java/eu/eudat/commonmodels/models/DmpUserModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/DmpUserModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
-import eu.eudat.commonmodels.enums.DmpUserRole;
+import org.opencdmp.commonmodels.enums.DmpUserRole;
public class DmpUserModel {
private UserModel user;
diff --git a/src/main/java/eu/eudat/commonmodels/models/EntityDoiModel.java b/src/main/java/org/opencdmp/commonmodels/models/EntityDoiModel.java
similarity index 91%
rename from src/main/java/eu/eudat/commonmodels/models/EntityDoiModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/EntityDoiModel.java
index 29fc321..901ebbd 100644
--- a/src/main/java/eu/eudat/commonmodels/models/EntityDoiModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/EntityDoiModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/FileEnvelopeModel.java b/src/main/java/org/opencdmp/commonmodels/models/FileEnvelopeModel.java
similarity index 94%
rename from src/main/java/eu/eudat/commonmodels/models/FileEnvelopeModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/FileEnvelopeModel.java
index 400963b..d10811e 100644
--- a/src/main/java/eu/eudat/commonmodels/models/FileEnvelopeModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/FileEnvelopeModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
public class FileEnvelopeModel {
private String filename;
diff --git a/src/main/java/eu/eudat/commonmodels/models/TagModel.java b/src/main/java/org/opencdmp/commonmodels/models/TagModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/TagModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/TagModel.java
index 1fa2808..1078ce3 100644
--- a/src/main/java/eu/eudat/commonmodels/models/TagModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/TagModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/UserContactInfoModel.java b/src/main/java/org/opencdmp/commonmodels/models/UserContactInfoModel.java
similarity index 90%
rename from src/main/java/eu/eudat/commonmodels/models/UserContactInfoModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/UserContactInfoModel.java
index e2bff6a..67c9e54 100644
--- a/src/main/java/eu/eudat/commonmodels/models/UserContactInfoModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/UserContactInfoModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
-import eu.eudat.commonmodels.enums.ContactInfoType;
+import org.opencdmp.commonmodels.enums.ContactInfoType;
import java.time.Instant;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/UserModel.java b/src/main/java/org/opencdmp/commonmodels/models/UserModel.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/models/UserModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/UserModel.java
index 204ebaa..4187fb5 100644
--- a/src/main/java/eu/eudat/commonmodels/models/UserModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/UserModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models;
+package org.opencdmp.commonmodels.models;
import java.util.List;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java
index ed0f347..e632c1d 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java
@@ -1,9 +1,9 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
-import eu.eudat.commonmodels.enums.DescriptionStatus;
-import eu.eudat.commonmodels.models.dmp.DmpModel;
-import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
+import org.opencdmp.commonmodels.enums.DescriptionStatus;
+import org.opencdmp.commonmodels.models.dmp.DmpModel;
+import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import java.time.Instant;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/ExternalIdentifierModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/ExternalIdentifierModel.java
similarity index 88%
rename from src/main/java/eu/eudat/commonmodels/models/description/ExternalIdentifierModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/ExternalIdentifierModel.java
index de25d7b..364b41b 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/ExternalIdentifierModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/ExternalIdentifierModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
public class ExternalIdentifierModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/FieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/FieldModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/description/FieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/FieldModel.java
index 307797f..6ceedaa 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/FieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/FieldModel.java
@@ -1,7 +1,7 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
-import eu.eudat.commonmodels.models.FileEnvelopeModel;
-import eu.eudat.commonmodels.models.reference.ReferenceModel;
+import org.opencdmp.commonmodels.models.FileEnvelopeModel;
+import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import java.time.Instant;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java
similarity index 92%
rename from src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java
index c67fa29..7bda439 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetItemModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
import java.util.Map;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetModel.java
similarity index 86%
rename from src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetModel.java
index bbbd445..781bc52 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionFieldSetModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionFieldSetModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionModel.java
similarity index 87%
rename from src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionModel.java
index 67766f9..638decd 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/PropertyDefinitionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/PropertyDefinitionModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
import java.util.Map;
diff --git a/src/main/java/eu/eudat/commonmodels/models/description/VisibilityStateModel.java b/src/main/java/org/opencdmp/commonmodels/models/description/VisibilityStateModel.java
similarity index 91%
rename from src/main/java/eu/eudat/commonmodels/models/description/VisibilityStateModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/description/VisibilityStateModel.java
index f7a19bc..1341b93 100644
--- a/src/main/java/eu/eudat/commonmodels/models/description/VisibilityStateModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/description/VisibilityStateModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.description;
+package org.opencdmp.commonmodels.models.description;
public class VisibilityStateModel {
private String fieldId;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DefinitionModel.java
similarity index 95%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DefinitionModel.java
index fbad319..5ce5924 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DefinitionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DefinitionModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java
similarity index 91%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java
index 3e6ecc9..40a5f4d 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/DescriptionTemplateModel.java
@@ -1,7 +1,7 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
-import eu.eudat.commonmodels.models.DescriptionTemplateTypeModel;
+import org.opencdmp.commonmodels.models.DescriptionTemplateTypeModel;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldModel.java
similarity index 87%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldModel.java
index c356b49..ac57ce9 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldModel.java
@@ -1,7 +1,7 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
-import eu.eudat.commonmodels.enums.FieldValidationType;
-import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel;
+import org.opencdmp.commonmodels.enums.FieldValidationType;
+import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldSetModel.java
similarity index 97%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldSetModel.java
index 1ca9399..b7c4eeb 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldSetModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/MultiplicityModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/MultiplicityModel.java
similarity index 91%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/MultiplicityModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/MultiplicityModel.java
index 9541ed7..e6de728 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/MultiplicityModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/MultiplicityModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
public class MultiplicityModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/PageModel.java
similarity index 95%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/PageModel.java
index 5b9263e..ae5bf6b 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/PageModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/PageModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/SectionModel.java
similarity index 97%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/SectionModel.java
index f2156e0..315ee96 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/SectionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/SectionModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate;
+package org.opencdmp.commonmodels.models.descriptiotemplate;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java
similarity index 94%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java
index 64c4dda..725ccbd 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/BaseFieldDataModel.java
@@ -1,8 +1,8 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import eu.eudat.commonmodels.enums.FieldType;
+import org.opencdmp.commonmodels.enums.FieldType;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java
similarity index 79%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java
index 44965e3..7b7dac4 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelAndMultiplicityDataModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
public class LabelAndMultiplicityDataModel extends BaseFieldDataModel {
private Boolean multipleSelect;
diff --git a/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java
new file mode 100644
index 0000000..e322743
--- /dev/null
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/LabelDataModel.java
@@ -0,0 +1,5 @@
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
+
+public class LabelDataModel extends BaseFieldDataModel {
+
+}
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java
index 3af14d8..4c50c74 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/RadioBoxDataModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java
similarity index 77%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java
index 846d918..fa803ca 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/ReferenceTypeDataModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
-import eu.eudat.commonmodels.models.reference.ReferenceTypeModel;
+import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
public class ReferenceTypeDataModel extends BaseFieldDataModel {
private Boolean multipleSelect;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java
index 4636de8..70ee57a 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/SelectDataModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java
similarity index 89%
rename from src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java
index 72855e6..855058b 100644
--- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/fielddata/UploadDataModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.descriptiotemplate.fielddata;
+package org.opencdmp.commonmodels.models.descriptiotemplate.fielddata;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpBlueprintValueModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpBlueprintValueModel.java
similarity index 88%
rename from src/main/java/eu/eudat/commonmodels/models/dmp/DmpBlueprintValueModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmp/DmpBlueprintValueModel.java
index eda0132..c5c0c4a 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpBlueprintValueModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpBlueprintValueModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.dmp;
+package org.opencdmp.commonmodels.models.dmp;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpContactModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpContactModel.java
similarity index 86%
rename from src/main/java/eu/eudat/commonmodels/models/dmp/DmpContactModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmp/DmpContactModel.java
index e88414a..d54d379 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpContactModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpContactModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.dmp;
+package org.opencdmp.commonmodels.models.dmp;
-import eu.eudat.commonmodels.models.UserModel;
+import org.opencdmp.commonmodels.models.UserModel;
public class DmpContactModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpModel.java
similarity index 88%
rename from src/main/java/eu/eudat/commonmodels/models/dmp/DmpModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmp/DmpModel.java
index 1329e91..8e1edad 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpModel.java
@@ -1,15 +1,14 @@
-package eu.eudat.commonmodels.models.dmp;
+package org.opencdmp.commonmodels.models.dmp;
-import eu.eudat.commonmodels.enums.DmpAccessType;
-import eu.eudat.commonmodels.enums.DmpStatus;
-import eu.eudat.commonmodels.models.DmpUserModel;
-import eu.eudat.commonmodels.models.EntityDoiModel;
-import eu.eudat.commonmodels.models.FileEnvelopeModel;
-import eu.eudat.commonmodels.models.UserModel;
-import eu.eudat.commonmodels.models.description.DescriptionModel;
-import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel;
-import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel;
-import eu.eudat.commonmodels.models.reference.ReferenceModel;
+import org.opencdmp.commonmodels.enums.DmpAccessType;
+import org.opencdmp.commonmodels.enums.DmpStatus;
+import org.opencdmp.commonmodels.models.DmpUserModel;
+import org.opencdmp.commonmodels.models.EntityDoiModel;
+import org.opencdmp.commonmodels.models.FileEnvelopeModel;
+import org.opencdmp.commonmodels.models.UserModel;
+import org.opencdmp.commonmodels.models.description.DescriptionModel;
+import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
+import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import java.time.Instant;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpPropertiesModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpPropertiesModel.java
similarity index 83%
rename from src/main/java/eu/eudat/commonmodels/models/dmp/DmpPropertiesModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmp/DmpPropertiesModel.java
index 88ff99b..e55e834 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmp/DmpPropertiesModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmp/DmpPropertiesModel.java
@@ -1,9 +1,6 @@
-package eu.eudat.commonmodels.models.dmp;
-
-import eu.eudat.commonmodels.models.UserModel;
+package org.opencdmp.commonmodels.models.dmp;
import java.util.List;
-import java.util.UUID;
public class DmpPropertiesModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DefinitionModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DefinitionModel.java
similarity index 82%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DefinitionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DefinitionModel.java
index 85d5b2b..4fd3eb5 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DefinitionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DefinitionModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DmpBlueprintModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DmpBlueprintModel.java
similarity index 87%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DmpBlueprintModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DmpBlueprintModel.java
index a92dcf2..9e35e3d 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/DmpBlueprintModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/DmpBlueprintModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
-import eu.eudat.commonmodels.enums.DmpBlueprintStatus;
+import org.opencdmp.commonmodels.enums.DmpBlueprintStatus;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ExtraFieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ExtraFieldModel.java
similarity index 69%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ExtraFieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ExtraFieldModel.java
index 60a827e..10568be 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ExtraFieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ExtraFieldModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
-import eu.eudat.commonmodels.enums.DmpBlueprintExtraFieldDataType;
+import org.opencdmp.commonmodels.enums.DmpBlueprintExtraFieldDataType;
public class ExtraFieldModel extends FieldModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/FieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/FieldModel.java
similarity index 93%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/FieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/FieldModel.java
index f3446a1..d70ebc1 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/FieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/FieldModel.java
@@ -1,8 +1,8 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import eu.eudat.commonmodels.enums.DmpBlueprintFieldCategory;
+import org.opencdmp.commonmodels.enums.DmpBlueprintFieldCategory;
import java.util.List;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java
similarity index 77%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java
index 57dce2e..25f55a6 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/ReferenceTypeFieldModel.java
@@ -1,8 +1,6 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
-import eu.eudat.commonmodels.models.reference.ReferenceTypeModel;
-
-import java.util.UUID;
+import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
public class ReferenceTypeFieldModel extends FieldModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SectionModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SectionModel.java
similarity index 88%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SectionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SectionModel.java
index c02367f..4257619 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SectionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SectionModel.java
@@ -1,6 +1,4 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
-
-import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
+package org.opencdmp.commonmodels.models.dmpblueprint;
import java.util.List;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SystemFieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SystemFieldModel.java
similarity index 72%
rename from src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SystemFieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SystemFieldModel.java
index 288ce91..53bca23 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SystemFieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpblueprint/SystemFieldModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.dmpblueprint;
+package org.opencdmp.commonmodels.models.dmpblueprint;
-import eu.eudat.commonmodels.enums.DmpBlueprintSystemFieldType;
+import org.opencdmp.commonmodels.enums.DmpBlueprintSystemFieldType;
public class SystemFieldModel extends FieldModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceDataModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceDataModel.java
similarity index 83%
rename from src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceDataModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceDataModel.java
index 52e6736..c394222 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceDataModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceDataModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.dmpreference;
+package org.opencdmp.commonmodels.models.dmpreference;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceModel.java b/src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceModel.java
similarity index 81%
rename from src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceModel.java
index 06ef9f6..2aed113 100644
--- a/src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/dmpreference/DmpReferenceModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.dmpreference;
+package org.opencdmp.commonmodels.models.dmpreference;
-import eu.eudat.commonmodels.models.reference.ReferenceModel;
+import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceDefinitionModel.java b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceDefinitionModel.java
similarity index 83%
rename from src/main/java/eu/eudat/commonmodels/models/reference/ReferenceDefinitionModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceDefinitionModel.java
index a562826..460776d 100644
--- a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceDefinitionModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceDefinitionModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.reference;
+package org.opencdmp.commonmodels.models.reference;
import java.util.List;
diff --git a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceFieldModel.java b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceFieldModel.java
similarity index 87%
rename from src/main/java/eu/eudat/commonmodels/models/reference/ReferenceFieldModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceFieldModel.java
index 15563f4..49f8051 100644
--- a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceFieldModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceFieldModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.reference;
+package org.opencdmp.commonmodels.models.reference;
public class ReferenceFieldModel {
diff --git a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceModel.java b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceModel.java
similarity index 94%
rename from src/main/java/eu/eudat/commonmodels/models/reference/ReferenceModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceModel.java
index 06ee27a..055ec57 100644
--- a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceModel.java
@@ -1,6 +1,6 @@
-package eu.eudat.commonmodels.models.reference;
+package org.opencdmp.commonmodels.models.reference;
-import eu.eudat.commonmodels.enums.ReferenceSourceType;
+import org.opencdmp.commonmodels.enums.ReferenceSourceType;
import java.util.UUID;
diff --git a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceTypeModel.java b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceTypeModel.java
similarity index 90%
rename from src/main/java/eu/eudat/commonmodels/models/reference/ReferenceTypeModel.java
rename to src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceTypeModel.java
index 7cc708a..f2dc3a9 100644
--- a/src/main/java/eu/eudat/commonmodels/models/reference/ReferenceTypeModel.java
+++ b/src/main/java/org/opencdmp/commonmodels/models/reference/ReferenceTypeModel.java
@@ -1,4 +1,4 @@
-package eu.eudat.commonmodels.models.reference;
+package org.opencdmp.commonmodels.models.reference;
import java.util.UUID;