diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Abundance_Level.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Abundance_Level.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Abundance_Level.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Abundance_Level.java
index c91439a..4975be0 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Abundance_Level.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Abundance_Level.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/org/gcube/datacatalogue/common/Constants.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Constants.java
similarity index 99%
rename from src/main/java/org/gcube/datacatalogue/common/Constants.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Constants.java
index e8514ba..ba8f529 100644
--- a/src/main/java/org/gcube/datacatalogue/common/Constants.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Constants.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 /**
  * Constants shared between manager panel and service
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Exploitation_Rate.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Exploitation_Rate.java
similarity index 95%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Exploitation_Rate.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Exploitation_Rate.java
index edf6894..4158a7e 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Exploitation_Rate.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Exploitation_Rate.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Fishery_Type.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishery_Type.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Fishery_Type.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishery_Type.java
index 88afa8d..a66e9f8 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Fishery_Type.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishery_Type.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Fishing_Pressure.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishing_Pressure.java
similarity index 95%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Fishing_Pressure.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishing_Pressure.java
index 61c8df1..c9bdfa0 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Fishing_Pressure.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Fishing_Pressure.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Product_Type.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Product_Type.java
similarity index 95%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Product_Type.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Product_Type.java
index 19e61c1..eee9309 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Product_Type.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Product_Type.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Production_System_Type.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Production_System_Type.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Production_System_Type.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Production_System_Type.java
index dc8c8f5..010a4e3 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Production_System_Type.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Production_System_Type.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Sources.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Sources.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Sources.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Sources.java
index dbcfeb7..78f2b32 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Sources.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Sources.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Status.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Status.java
similarity index 97%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Status.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Status.java
index da840c2..8618f36 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Status.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Status.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/org/gcube/datacatalogue/common/enums/Stock_Type.java b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Stock_Type.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/common/enums/Stock_Type.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Stock_Type.java
index 11d85d5..accf784 100644
--- a/src/main/java/org/gcube/datacatalogue/common/enums/Stock_Type.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_PORTED/Stock_Type.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.enums;
+package org.gcube.datacatalogue.common.AAA_PORTED;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/gcube/datacatalogue/common/caches/CacheImpl.java b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheImpl.java
similarity index 95%
rename from src/main/java/org/gcube/datacatalogue/common/caches/CacheImpl.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheImpl.java
index 3441573..bb0fe5b 100644
--- a/src/main/java/org/gcube/datacatalogue/common/caches/CacheImpl.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheImpl.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.caches;
+package org.gcube.datacatalogue.common.AAA_UNNEEDED;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/org/gcube/datacatalogue/common/caches/CacheInterface.java b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheInterface.java
similarity index 89%
rename from src/main/java/org/gcube/datacatalogue/common/caches/CacheInterface.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheInterface.java
index 130e489..32968ba 100644
--- a/src/main/java/org/gcube/datacatalogue/common/caches/CacheInterface.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheInterface.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.caches;
+package org.gcube.datacatalogue.common.AAA_UNNEEDED;
 
 /**
  * Generic interface
diff --git a/src/main/java/org/gcube/datacatalogue/common/caches/CacheUtilities.java b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheUtilities.java
similarity index 90%
rename from src/main/java/org/gcube/datacatalogue/common/caches/CacheUtilities.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheUtilities.java
index 3d4c169..13f0fa1 100644
--- a/src/main/java/org/gcube/datacatalogue/common/caches/CacheUtilities.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheUtilities.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.caches;
+package org.gcube.datacatalogue.common.AAA_UNNEEDED;
 
 /**
  * Utility functions for caches
diff --git a/src/main/java/org/gcube/datacatalogue/common/caches/CacheValueBean.java b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheValueBean.java
similarity index 93%
rename from src/main/java/org/gcube/datacatalogue/common/caches/CacheValueBean.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheValueBean.java
index f1efc06..111192f 100644
--- a/src/main/java/org/gcube/datacatalogue/common/caches/CacheValueBean.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/CacheValueBean.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common.caches;
+package org.gcube.datacatalogue.common.AAA_UNNEEDED;
 
 /**
  * A bean object to be used as value within the cache. It contains a TTL value too.
diff --git a/src/main/java/org/gcube/datacatalogue/common/GRSFCommon.java b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/GRSFCommon.java
similarity index 82%
rename from src/main/java/org/gcube/datacatalogue/common/GRSFCommon.java
rename to src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/GRSFCommon.java
index 9a72cc1..ee6abf4 100644
--- a/src/main/java/org/gcube/datacatalogue/common/GRSFCommon.java
+++ b/src/main/java/org/gcube/datacatalogue/common/AAA_UNNEEDED/GRSFCommon.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.common;
+package org.gcube.datacatalogue.common.AAA_UNNEEDED;
 
 import com.google.gwt.core.client.EntryPoint;