diff --git a/WebContent/WEB-INF/ldf-server-example.json b/WebContent/WEB-INF/ldf-server-example.json
deleted file mode 100644
index 3342f5a..0000000
--- a/WebContent/WEB-INF/ldf-server-example.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "datasources": {
-    "dbpedia": {
-      "path": "/path/to/dataset.hdt"
-    }
-  },
-
-  "prefixes": {
-    "rdf":         "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-    "rdfs":        "http://www.w3.org/2000/01/rdf-schema#",
-    "owl":         "http://www.w3.org/2002/07/owl#",
-    "skos":        "http://www.w3.org/2004/02/skos/core#",
-    "xsd":         "http://www.w3.org/2001/XMLSchema#",
-    "dc":          "http://purl.org/dc/terms/",
-    "dcterms":     "http://purl.org/dc/terms/",
-    "dc11":        "http://purl.org/dc/elements/1.1/",
-    "foaf":        "http://xmlns.com/foaf/0.1/",
-    "geo":         "http://www.w3.org/2003/01/geo/wgs84_pos#",
-    "dbpedia":     "http://dbpedia.org/resource/",
-    "dbpedia-owl": "http://dbpedia.org/ontology/",
-    "dbpprop":     "http://dbpedia.org/property/",
-    "hydra":       "http://www.w3.org/ns/hydra/core#",
-    "void":        "http://rdfs.org/ns/void#"
-  }
-}
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 4a3f9c1..82d1488 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -2,8 +2,8 @@
 <web-app id="WebApp_ID" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <display-name>Linked Data Fragments Server</display-name>
     <servlet>
-        <display-name>BasicLdfServlet</display-name>
-        <servlet-name>BasicLdfServlet</servlet-name>
+        <display-name>TpfServlet</display-name>
+        <servlet-name>TpfServlet</servlet-name>
         <servlet-class>org.linkeddatafragments.servlet.LinkedDataFragmentServlet</servlet-class>
     </servlet>
     <servlet>
@@ -11,7 +11,7 @@
         <servlet-class>org.linkeddatafragments.servlet.AssetServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>BasicLdfServlet</servlet-name>
+        <servlet-name>TpfServlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
diff --git a/pom.xml b/pom.xml
index c6844ce..25f6c12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -226,7 +225,7 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </snapshotRepository>
     </distributionManagement>
 </project>
diff --git a/src/org/linkeddatafragments/config/ConfigReader.java b/src/main/java/org/linkeddatafragments/config/ConfigReader.java
similarity index 100%
rename from src/org/linkeddatafragments/config/ConfigReader.java
rename to src/main/java/org/linkeddatafragments/config/ConfigReader.java
diff --git a/src/org/linkeddatafragments/datasource/AbstractRequestProcessor.java b/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
rename to src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
diff --git a/src/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java b/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
rename to src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
diff --git a/src/org/linkeddatafragments/datasource/DataSourceBase.java b/src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/DataSourceBase.java
rename to src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java
diff --git a/src/org/linkeddatafragments/datasource/DataSourceFactory.java b/src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/DataSourceFactory.java
rename to src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java
diff --git a/src/org/linkeddatafragments/datasource/DataSourceTypesRegistry.java b/src/main/java/org/linkeddatafragments/datasource/DataSourceTypesRegistry.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/DataSourceTypesRegistry.java
rename to src/main/java/org/linkeddatafragments/datasource/DataSourceTypesRegistry.java
diff --git a/src/org/linkeddatafragments/datasource/IDataSource.java b/src/main/java/org/linkeddatafragments/datasource/IDataSource.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/IDataSource.java
rename to src/main/java/org/linkeddatafragments/datasource/IDataSource.java
diff --git a/src/org/linkeddatafragments/datasource/IDataSourceType.java b/src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/IDataSourceType.java
rename to src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java
diff --git a/src/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java b/src/main/java/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java
rename to src/main/java/org/linkeddatafragments/datasource/IFragmentRequestProcessor.java
diff --git a/src/org/linkeddatafragments/datasource/hdt/HdtBasedRequestProcessorForTPFs.java b/src/main/java/org/linkeddatafragments/datasource/hdt/HdtBasedRequestProcessorForTPFs.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/hdt/HdtBasedRequestProcessorForTPFs.java
rename to src/main/java/org/linkeddatafragments/datasource/hdt/HdtBasedRequestProcessorForTPFs.java
diff --git a/src/org/linkeddatafragments/datasource/hdt/HdtDataSource.java b/src/main/java/org/linkeddatafragments/datasource/hdt/HdtDataSource.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/hdt/HdtDataSource.java
rename to src/main/java/org/linkeddatafragments/datasource/hdt/HdtDataSource.java
diff --git a/src/org/linkeddatafragments/datasource/hdt/HdtDataSourceType.java b/src/main/java/org/linkeddatafragments/datasource/hdt/HdtDataSourceType.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/hdt/HdtDataSourceType.java
rename to src/main/java/org/linkeddatafragments/datasource/hdt/HdtDataSourceType.java
diff --git a/src/org/linkeddatafragments/datasource/index/IndexDataSource.java b/src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/index/IndexDataSource.java
rename to src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java
diff --git a/src/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java b/src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
rename to src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
diff --git a/src/org/linkeddatafragments/datasource/tdb/JenaTDBBasedRequestProcessorForTPFs.java b/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBBasedRequestProcessorForTPFs.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/tdb/JenaTDBBasedRequestProcessorForTPFs.java
rename to src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBBasedRequestProcessorForTPFs.java
diff --git a/src/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java b/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
rename to src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
diff --git a/src/org/linkeddatafragments/datasource/tdb/JenaTDBDataSourceType.java b/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSourceType.java
similarity index 100%
rename from src/org/linkeddatafragments/datasource/tdb/JenaTDBDataSourceType.java
rename to src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSourceType.java
diff --git a/src/org/linkeddatafragments/exceptions/DataSourceCreationException.java b/src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java
similarity index 100%
rename from src/org/linkeddatafragments/exceptions/DataSourceCreationException.java
rename to src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java
diff --git a/src/org/linkeddatafragments/exceptions/DataSourceException.java b/src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java
similarity index 100%
rename from src/org/linkeddatafragments/exceptions/DataSourceException.java
rename to src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java
diff --git a/src/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java b/src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
similarity index 100%
rename from src/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
rename to src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
diff --git a/src/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java b/src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
similarity index 100%
rename from src/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
rename to src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
diff --git a/src/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java b/src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
similarity index 100%
rename from src/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
rename to src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
diff --git a/src/org/linkeddatafragments/fragments/FragmentRequestParserBase.java b/src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
rename to src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
diff --git a/src/org/linkeddatafragments/fragments/IFragmentRequestParser.java b/src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/IFragmentRequestParser.java
rename to src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java
diff --git a/src/org/linkeddatafragments/fragments/ILinkedDataFragment.java b/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/ILinkedDataFragment.java
rename to src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java
diff --git a/src/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java b/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
rename to src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java b/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
rename to src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
diff --git a/src/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java b/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
rename to src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java b/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/ITriplePatternFragment.java b/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragment.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/ITriplePatternFragment.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragment.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java b/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TPFRequestParserForJenaBackends.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParserForJenaBackends.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TPFRequestParserForJenaBackends.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParserForJenaBackends.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TriplePatternElementFactory.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternElementFactory.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TriplePatternElementFactory.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternElementFactory.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentImpl.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentImpl.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentImpl.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentImpl.java
diff --git a/src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequestImpl.java b/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequestImpl.java
similarity index 100%
rename from src/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequestImpl.java
rename to src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentRequestImpl.java
diff --git a/src/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java b/src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
similarity index 100%
rename from src/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
rename to src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
diff --git a/src/org/linkeddatafragments/standalone/JettyServer.java b/src/main/java/org/linkeddatafragments/standalone/JettyServer.java
similarity index 100%
rename from src/org/linkeddatafragments/standalone/JettyServer.java
rename to src/main/java/org/linkeddatafragments/standalone/JettyServer.java
diff --git a/src/org/linkeddatafragments/util/CommonResources.java b/src/main/java/org/linkeddatafragments/util/CommonResources.java
similarity index 100%
rename from src/org/linkeddatafragments/util/CommonResources.java
rename to src/main/java/org/linkeddatafragments/util/CommonResources.java
diff --git a/src/org/linkeddatafragments/util/MIMEParse.java b/src/main/java/org/linkeddatafragments/util/MIMEParse.java
similarity index 100%
rename from src/org/linkeddatafragments/util/MIMEParse.java
rename to src/main/java/org/linkeddatafragments/util/MIMEParse.java
diff --git a/src/org/linkeddatafragments/util/RDFTermParser.java b/src/main/java/org/linkeddatafragments/util/RDFTermParser.java
similarity index 100%
rename from src/org/linkeddatafragments/util/RDFTermParser.java
rename to src/main/java/org/linkeddatafragments/util/RDFTermParser.java
diff --git a/src/org/linkeddatafragments/util/TriplePatternElementParser.java b/src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java
similarity index 100%
rename from src/org/linkeddatafragments/util/TriplePatternElementParser.java
rename to src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java
diff --git a/src/org/linkeddatafragments/util/TriplePatternElementParserForJena.java b/src/main/java/org/linkeddatafragments/util/TriplePatternElementParserForJena.java
similarity index 100%
rename from src/org/linkeddatafragments/util/TriplePatternElementParserForJena.java
rename to src/main/java/org/linkeddatafragments/util/TriplePatternElementParserForJena.java
diff --git a/src/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java b/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
similarity index 96%
rename from src/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
rename to src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
index 5c3bcf3..c8ebb59 100644
--- a/src/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
+++ b/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
@@ -10,6 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -19,7 +20,6 @@
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.index.IndexDataSource;
 import org.linkeddatafragments.fragments.ILinkedDataFragment;
-import org.linkeddatafragments.fragments.ILinkedDataFragmentRequest;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternFragment;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternFragmentRequest;
 
@@ -39,7 +39,6 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
     private final Template errorTemplate;
     
     private final String HYDRA = "http://www.w3.org/ns/hydra/core#"; 
-    private final String VOID = "http://rdfs.org/ns/void#"; 
     
     /**
      *
@@ -51,7 +50,7 @@ public HtmlTriplePatternFragmentWriterImpl(Map<String, String> prefixes, HashMap
         super(prefixes, datasources);
         
         cfg = new Configuration(Configuration.VERSION_2_3_22);
-        cfg.setDirectoryForTemplateLoading(new File(System.getProperty("user.dir") + "/views"));
+        cfg.setClassForTemplateLoading(getClass(), "/views");
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
         
diff --git a/src/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java b/src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
similarity index 100%
rename from src/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
rename to src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
diff --git a/src/org/linkeddatafragments/views/LinkedDataFragmentWriterBase.java b/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterBase.java
similarity index 100%
rename from src/org/linkeddatafragments/views/LinkedDataFragmentWriterBase.java
rename to src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterBase.java
diff --git a/src/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java b/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
similarity index 100%
rename from src/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
rename to src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
diff --git a/src/org/linkeddatafragments/views/RdfWriterImpl.java b/src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java
similarity index 100%
rename from src/org/linkeddatafragments/views/RdfWriterImpl.java
rename to src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java
diff --git a/src/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java b/src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
similarity index 100%
rename from src/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
rename to src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
diff --git a/src/org/linkeddatafragments/assets/favicon.ico b/src/main/resources/assets/favicon.ico
similarity index 100%
rename from src/org/linkeddatafragments/assets/favicon.ico
rename to src/main/resources/assets/favicon.ico
diff --git a/src/org/linkeddatafragments/assets/logo.svg b/src/main/resources/assets/logo.svg
similarity index 100%
rename from src/org/linkeddatafragments/assets/logo.svg
rename to src/main/resources/assets/logo.svg
diff --git a/src/org/linkeddatafragments/assets/style.css b/src/main/resources/assets/style.css
similarity index 100%
rename from src/org/linkeddatafragments/assets/style.css
rename to src/main/resources/assets/style.css
diff --git a/src/main/resources/config-example.json b/src/main/resources/config-example.json
new file mode 100644
index 0000000..11fcdf1
--- /dev/null
+++ b/src/main/resources/config-example.json
@@ -0,0 +1,36 @@
+{
+  "title": "My Linked Data Fragments server",
+
+  "datasourcetypes": {
+    "HdtDatasource"       : "org.linkeddatafragments.datasource.hdt.HdtDataSourceType",
+    "JenaTDBDatasource"   : "org.linkeddatafragments.datasource.tdb.JenaTDBDataSourceType"
+  },
+
+  "datasources": {
+    "dbpedia": {
+      "title": "DBPedia",
+      "type": "HdtDatasource",
+      "description": "DBPedia with an HDT back-end",
+      "settings": { "file": "data/dbpedia.hdt" }
+    },
+    "swdf": {
+      "title": "Semantic Web Dog Food",
+      "type": "HdtDatasource",
+      "description": "Semantic Web Dog Food with an HDT back-end",
+      "settings": { "file": "data/swdf.hdt" }
+    }
+  },
+
+  "prefixes": {
+    "rdf":         "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs":        "http://www.w3.org/2000/01/rdf-schema#",
+    "xsd":         "http://www.w3.org/2001/XMLSchema#",
+    "dc":          "http://purl.org/dc/terms/",
+    "foaf":        "http://xmlns.com/foaf/0.1/",
+    "dbpedia":     "http://dbpedia.org/resource/",
+    "dbpedia-owl": "http://dbpedia.org/ontology/",
+    "dbpprop":     "http://dbpedia.org/property/",
+    "hydra":       "http://www.w3.org/ns/hydra/core#",
+    "void":        "http://rdfs.org/ns/void#"
+  }
+}
diff --git a/views/base.ftl.html b/src/main/resources/views/base.ftl.html
similarity index 100%
rename from views/base.ftl.html
rename to src/main/resources/views/base.ftl.html
diff --git a/views/datasource.ftl.html b/src/main/resources/views/datasource.ftl.html
similarity index 100%
rename from views/datasource.ftl.html
rename to src/main/resources/views/datasource.ftl.html
diff --git a/views/error.ftl.html b/src/main/resources/views/error.ftl.html
similarity index 100%
rename from views/error.ftl.html
rename to src/main/resources/views/error.ftl.html
diff --git a/views/fragment.ftl.html b/src/main/resources/views/fragment.ftl.html
similarity index 100%
rename from views/fragment.ftl.html
rename to src/main/resources/views/fragment.ftl.html
diff --git a/views/index.ftl.html b/src/main/resources/views/index.ftl.html
similarity index 100%
rename from views/index.ftl.html
rename to src/main/resources/views/index.ftl.html
diff --git a/views/notfound.ftl.html b/src/main/resources/views/notfound.ftl.html
similarity index 100%
rename from views/notfound.ftl.html
rename to src/main/resources/views/notfound.ftl.html
diff --git a/src/test/java/org/linkeddatafragments/TestSuite.java b/src/test/java/org/linkeddatafragments/test/TestSuite.java
similarity index 57%
rename from src/test/java/org/linkeddatafragments/TestSuite.java
rename to src/test/java/org/linkeddatafragments/test/TestSuite.java
index 989855e..1accb53 100644
--- a/src/test/java/org/linkeddatafragments/TestSuite.java
+++ b/src/test/java/org/linkeddatafragments/test/TestSuite.java
@@ -1,10 +1,10 @@
-package test.java.org.linkeddatafragments;
+package org.linkeddatafragments.test;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import test.java.org.linkeddatafragments.datasource.HdtDataSourceTest;
-import test.java.org.linkeddatafragments.datasource.JenaTDBDataSourceTest;
+import org.linkeddatafragments.test.datasource.HdtDataSourceTest;
+import org.linkeddatafragments.test.datasource.JenaTDBDataSourceTest;
 
 /**
  *
diff --git a/src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java b/src/test/java/org/linkeddatafragments/test/datasource/DataSourceTest.java
similarity index 96%
rename from src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java
rename to src/test/java/org/linkeddatafragments/test/datasource/DataSourceTest.java
index 39b615d..8836620 100644
--- a/src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java
+++ b/src/test/java/org/linkeddatafragments/test/datasource/DataSourceTest.java
@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;
 
diff --git a/src/test/java/org/linkeddatafragments/datasource/HdtDataSourceTest.java b/src/test/java/org/linkeddatafragments/test/datasource/HdtDataSourceTest.java
similarity index 92%
rename from src/test/java/org/linkeddatafragments/datasource/HdtDataSourceTest.java
rename to src/test/java/org/linkeddatafragments/test/datasource/HdtDataSourceTest.java
index aab1956..891b6d6 100644
--- a/src/test/java/org/linkeddatafragments/datasource/HdtDataSourceTest.java
+++ b/src/test/java/org/linkeddatafragments/test/datasource/HdtDataSourceTest.java
@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;
 import com.hp.hpl.jena.rdf.model.RDFNode;
@@ -17,6 +17,7 @@
 import org.rdfhdt.hdt.hdt.HDT;
 import org.rdfhdt.hdt.hdt.HDTManager;
 import org.rdfhdt.hdt.options.HDTSpecification;
+import org.linkeddatafragments.test.datasource.DataSourceTest;
 
 /**
  *
diff --git a/src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java b/src/test/java/org/linkeddatafragments/test/datasource/JenaTDBDataSourceTest.java
similarity index 94%
rename from src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java
rename to src/test/java/org/linkeddatafragments/test/datasource/JenaTDBDataSourceTest.java
index 095f2bf..9a85f40 100644
--- a/src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java
+++ b/src/test/java/org/linkeddatafragments/test/datasource/JenaTDBDataSourceTest.java
@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;