diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityType.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityType.java
deleted file mode 100644
index 65f2b175..00000000
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package eu.dnetlib.openaire.community.db;
-
-public enum CommunityType {
-	community,
-	ri
-}
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimType.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java
similarity index 59%
rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimType.java
rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java
index 7e9f0900..c4bbca02 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimType.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.community.db;
+package eu.dnetlib.openaire.community.db.enums;
 
 public enum CommunityClaimType {
 	managersOnly,
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java
similarity index 95%
rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimTypeConverter.java
rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java
index f04bb752..d9940e49 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityClaimTypeConverter.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.community.db;
+package eu.dnetlib.openaire.community.db.enums;
 
 import javax.persistence.AttributeConverter;
 
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipType.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java
similarity index 57%
rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipType.java
rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java
index 442cd080..c530a553 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipType.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.community.db;
+package eu.dnetlib.openaire.community.db.enums;
 
 public enum CommunityMembershipType {
 
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java
similarity index 94%
rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipTypeConverter.java
rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java
index 1b25e35c..e959d2c3 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityMembershipTypeConverter.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.community.db;
+package eu.dnetlib.openaire.community.db.enums;
 
 import javax.persistence.AttributeConverter;
 
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityStatus.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityStatus.java
similarity index 58%
rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityStatus.java
rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityStatus.java
index 1c5cb969..058a52ad 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityStatus.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityStatus.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.community.db;
+package eu.dnetlib.openaire.community.db.enums;
 
 public enum CommunityStatus {
 	all,
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java
new file mode 100644
index 00000000..9c59b8d1
--- /dev/null
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java
@@ -0,0 +1,6 @@
+package eu.dnetlib.openaire.community.db.enums;
+
+public enum CommunityType {
+	community,
+	ri
+}
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java
index 5753220f..dff15706 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java
@@ -21,12 +21,12 @@ import com.vladmihalcea.hibernate.type.array.StringArrayType;
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import com.vladmihalcea.hibernate.type.json.JsonStringType;
 
-import eu.dnetlib.openaire.community.db.CommunityClaimType;
-import eu.dnetlib.openaire.community.db.CommunityClaimTypeConverter;
-import eu.dnetlib.openaire.community.db.CommunityMembershipType;
-import eu.dnetlib.openaire.community.db.CommunityMembershipTypeConverter;
-import eu.dnetlib.openaire.community.db.CommunityStatus;
-import eu.dnetlib.openaire.community.db.CommunityType;
+import eu.dnetlib.openaire.community.db.enums.CommunityClaimType;
+import eu.dnetlib.openaire.community.db.enums.CommunityClaimTypeConverter;
+import eu.dnetlib.openaire.community.db.enums.CommunityMembershipType;
+import eu.dnetlib.openaire.community.db.enums.CommunityMembershipTypeConverter;
+import eu.dnetlib.openaire.community.db.enums.CommunityStatus;
+import eu.dnetlib.openaire.community.db.enums.CommunityType;
 
 @Entity
 @Table(name = "communities")