diff --git a/src/main/java/org/gcube/informationsystem/knowledge/ModelKnowledge.java b/src/main/java/org/gcube/informationsystem/model/knowledge/ModelKnowledge.java
similarity index 99%
rename from src/main/java/org/gcube/informationsystem/knowledge/ModelKnowledge.java
rename to src/main/java/org/gcube/informationsystem/model/knowledge/ModelKnowledge.java
index e17b5b7..e701923 100644
--- a/src/main/java/org/gcube/informationsystem/knowledge/ModelKnowledge.java
+++ b/src/main/java/org/gcube/informationsystem/model/knowledge/ModelKnowledge.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.knowledge;
+package org.gcube.informationsystem.model.knowledge;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Arrays;
diff --git a/src/main/java/org/gcube/informationsystem/knowledge/TypeInformation.java b/src/main/java/org/gcube/informationsystem/model/knowledge/TypeInformation.java
similarity index 83%
rename from src/main/java/org/gcube/informationsystem/knowledge/TypeInformation.java
rename to src/main/java/org/gcube/informationsystem/model/knowledge/TypeInformation.java
index 5720ac9..64716ca 100644
--- a/src/main/java/org/gcube/informationsystem/knowledge/TypeInformation.java
+++ b/src/main/java/org/gcube/informationsystem/model/knowledge/TypeInformation.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.knowledge;
+package org.gcube.informationsystem.model.knowledge;
 
 import org.gcube.informationsystem.base.reference.AccessType;
 import org.gcube.informationsystem.tree.NodeInformation;
diff --git a/src/main/java/org/gcube/informationsystem/knowledge/UsageKnowledge.java b/src/main/java/org/gcube/informationsystem/model/knowledge/UsageKnowledge.java
similarity index 92%
rename from src/main/java/org/gcube/informationsystem/knowledge/UsageKnowledge.java
rename to src/main/java/org/gcube/informationsystem/model/knowledge/UsageKnowledge.java
index ebcfdb5..1519d5a 100644
--- a/src/main/java/org/gcube/informationsystem/knowledge/UsageKnowledge.java
+++ b/src/main/java/org/gcube/informationsystem/model/knowledge/UsageKnowledge.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.knowledge;
+package org.gcube.informationsystem.model.knowledge;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/org/gcube/informationsystem/types/knowledge/TypeInformation.java b/src/main/java/org/gcube/informationsystem/types/knowledge/TypeInformation.java
index 42cbc5b..e698d80 100644
--- a/src/main/java/org/gcube/informationsystem/types/knowledge/TypeInformation.java
+++ b/src/main/java/org/gcube/informationsystem/types/knowledge/TypeInformation.java
@@ -10,7 +10,7 @@ import org.gcube.informationsystem.types.reference.Type;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class TypeInformation implements org.gcube.informationsystem.knowledge.TypeInformation<Type> {
+public class TypeInformation implements org.gcube.informationsystem.model.knowledge.TypeInformation<Type> {
 
 	@Override
 	public String getIdentifier(Type type) {
diff --git a/src/test/java/org/gcube/informationsystem/knowledge/ModelKnowledgeTest.java b/src/test/java/org/gcube/informationsystem/model/knowledge/ModelKnowledgeTest.java
similarity index 98%
rename from src/test/java/org/gcube/informationsystem/knowledge/ModelKnowledgeTest.java
rename to src/test/java/org/gcube/informationsystem/model/knowledge/ModelKnowledgeTest.java
index eee74e0..3576dde 100644
--- a/src/test/java/org/gcube/informationsystem/knowledge/ModelKnowledgeTest.java
+++ b/src/test/java/org/gcube/informationsystem/model/knowledge/ModelKnowledgeTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.knowledge;
+package org.gcube.informationsystem.model.knowledge;
 
 import java.io.File;
 import java.io.IOException;