diff --git a/enunciate.xml b/enunciate.xml
index 5ae5a43..4d33794 100644
--- a/enunciate.xml
+++ b/enunciate.xml
@@ -5,8 +5,6 @@
 	<api-classes>
 		<include pattern="org.gcube.gcat.rest.*" />
 		<exclude pattern="org.gcube.gcat.*" />
-		<exclude pattern="org.gcube.gcat.rest.Docs" />
-		<exclude pattern="org.gcube.gcat.rest.ApiDocs" />
 	</api-classes>
 	<modules>
 		<gwt-json-overlay disabled="true " />
diff --git a/src/main/java/org/gcube/gcat/ResourceInitializer.java b/src/main/java/org/gcube/gcat/ResourceInitializer.java
index d3618b9..54ec853 100644
--- a/src/main/java/org/gcube/gcat/ResourceInitializer.java
+++ b/src/main/java/org/gcube/gcat/ResourceInitializer.java
@@ -3,6 +3,7 @@ package org.gcube.gcat;
 import javax.ws.rs.ApplicationPath;
 
 import org.gcube.gcat.rest.Group;
+import org.gcube.gcat.rest.docs.Docs;
 import org.glassfish.jersey.server.ResourceConfig;
 
 /**
@@ -13,6 +14,7 @@ public class ResourceInitializer extends ResourceConfig {
 	
 	public ResourceInitializer() {
 		packages(Group.class.getPackage().toString());
+		packages(Docs.class.getPackage().toString());
 	}
 	
 }
diff --git a/src/main/java/org/gcube/gcat/rest/ApiDocs.java b/src/main/java/org/gcube/gcat/rest/docs/ApiDocs.java
similarity index 97%
rename from src/main/java/org/gcube/gcat/rest/ApiDocs.java
rename to src/main/java/org/gcube/gcat/rest/docs/ApiDocs.java
index 7f7701d..7acaa3e 100644
--- a/src/main/java/org/gcube/gcat/rest/ApiDocs.java
+++ b/src/main/java/org/gcube/gcat/rest/docs/ApiDocs.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.rest;
+package org.gcube.gcat.rest.docs;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/gcube/gcat/rest/Docs.java b/src/main/java/org/gcube/gcat/rest/docs/Docs.java
similarity index 97%
rename from src/main/java/org/gcube/gcat/rest/Docs.java
rename to src/main/java/org/gcube/gcat/rest/docs/Docs.java
index 8d6ca86..0f2fe8c 100644
--- a/src/main/java/org/gcube/gcat/rest/Docs.java
+++ b/src/main/java/org/gcube/gcat/rest/docs/Docs.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.rest;
+package org.gcube.gcat.rest.docs;
 
 import java.io.File;
 import java.io.FileInputStream;