diff --git a/README.md b/README.md
index e7463e0..b8142b7 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ By default, the Directory runs an in-memory RDF store, whose content is deleted
 
 #### Known issues
 
-On Windows, the execution will fail with a Batch error message. If [Mingw](http://mingw.org/) is installed on your machine, try to run `bin/thingweb-directory` inside an emulated Bash shell. Alternatively, try `java -cp lib\* de.thingweb.directory.ThingDirectory`.
+On Windows, the execution will fail with a Batch error message. If [Mingw](http://mingw.org/) is installed on your machine, try to run `bin/thingweb-directory` inside an emulated Bash shell. Alternatively, try `java -cp lib\* org.eclipse.thingweb.directory.ThingDirectory`.
 
 ### Interacting with the Directory
 
diff --git a/build.gradle b/build.gradle
index ace3880..e41067d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,11 +27,12 @@ apply plugin: 'groovy'
 apply plugin: 'application'
 apply plugin: 'eclipse'
 
+/* Groovy should be compiled first */
 sourceSets {
     main {
-        resources {
-            srcDirs = ["src/main/resources"]
-        }
+    	groovy { srcDirs = ["src/main/groovy", "src/main/java"] }
+    	java { srcDirs = [] }
+        resources { srcDirs = ["src/main/resources"] }
     }
 }
 
@@ -58,6 +59,6 @@ dependencies {
 	testCompile 'com.github.everit-org.json-schema:org.everit.json.schema:1.8.0'
 }
 
-version = '0.8.1'
-group = 'de.thingweb'
-mainClassName = 'de.thingweb.directory.ThingDirectory'
\ No newline at end of file
+version = '0.9.0'
+group = 'org.eclipse.thingweb'
+mainClassName = 'org.eclipse.thingweb.directory.ThingDirectory'
\ No newline at end of file
diff --git a/src/main/groovy/org/eclipse/thingweb/directory/utils/TDTransform.groovy b/src/main/groovy/org/eclipse/thingweb/directory/utils/TDTransform.groovy
index 7775059..b665d69 100644
--- a/src/main/groovy/org/eclipse/thingweb/directory/utils/TDTransform.groovy
+++ b/src/main/groovy/org/eclipse/thingweb/directory/utils/TDTransform.groovy
@@ -19,7 +19,6 @@ import groovy.json.*
 /**
  * 
  *  Compatibility script for JSON-LD 1.1.
- *  TODO nested properties
  *
  * @author Victor Charpenay
  * @creation 20.06.2018
diff --git a/src/main/java/org/eclipse/thingweb/directory/servlet/RDFDocumentServlet.java b/src/main/java/org/eclipse/thingweb/directory/servlet/RDFDocumentServlet.java
index 502075d..6909119 100644
--- a/src/main/java/org/eclipse/thingweb/directory/servlet/RDFDocumentServlet.java
+++ b/src/main/java/org/eclipse/thingweb/directory/servlet/RDFDocumentServlet.java
@@ -14,9 +14,7 @@
  ********************************************************************************/
 package org.eclipse.thingweb.directory.servlet;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -32,7 +30,6 @@
 import org.eclipse.thingweb.directory.rest.RESTServlet;
 import org.eclipse.thingweb.directory.servlet.exception.MalformedDocumentException;
 import org.eclipse.thingweb.directory.sparql.client.Queries;
-import org.eclipse.thingweb.directory.utils.TDTransform;
 
 public class RDFDocumentServlet extends RegistrationResourceServlet {
 	
diff --git a/src/main/java/org/eclipse/thingweb/directory/servlet/TDServlet.java b/src/main/java/org/eclipse/thingweb/directory/servlet/TDServlet.java
index 590885f..fe32551 100644
--- a/src/main/java/org/eclipse/thingweb/directory/servlet/TDServlet.java
+++ b/src/main/java/org/eclipse/thingweb/directory/servlet/TDServlet.java
@@ -17,33 +17,22 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
-import org.eclipse.rdf4j.model.ModelFactory;
 import org.eclipse.rdf4j.model.Resource;
-import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
-import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
 import org.eclipse.rdf4j.model.util.ModelBuilder;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
-import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFHandlerException;