diff --git a/.gitignore b/.gitignore
index 9543d32..d5b5511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
-/data
-/work
-/logs
-/.idea
-/target
-.DS_Store
-*.iml
 /.settings
 /.classpath
 /.project
 /.gradle
-/build
-/plugins
-/sessions
+**/data
+**/work
+**/logs
+**/.idea
+**/target
+**/out
+**/build
+.DS_Store
+*.iml
 *~
-*.MARC
diff --git a/README.adoc b/README.adoc
index 860b70b..1ae72ec 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,11 +1,32 @@
 # Network classes for Java
 
-image:https://api.travis-ci.org/xbib/net.svg[title="Build status", link="https://travis-ci.org/xbib/net/"]
-image:https://img.shields.io/sonar/http/nemo.sonarqube.com/org.xbib%3Anet/coverage.svg?style=flat-square[title="Coverage", link="https://sonarqube.com/dashboard/index?id=org.xbib%3Anet"]
-image:https://maven-badges.herokuapp.com/maven-central/org.xbib/net/badge.svg[title="Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Cxbib%20net"]
+## Net-url: Uniform Resource Locator implementation
+
+image:https://api.travis-ci.org/xbib/net-url.svg[title="Build status", link="https://travis-ci.org/xbib/net-url/"]
+image:https://img.shields.io/sonar/http/nemo.sonarqube.com/org.xbib%3Anet/coverage.svg?style=flat-square[title="Coverage", link="https://sonarqube.com/dashboard/index?id=org.xbib%3Anet-url"]
+image:https://maven-badges.herokuapp.com/maven-central/org.xbib/net-url/badge.svg[title="Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Cxbib%20net-url"]
 image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[title="Apache License 2.0", link="https://opensource.org/licenses/Apache-2.0"]
 image:https://img.shields.io/twitter/url/https/twitter.com/xbib.svg?style=social&label=Follow%20%40xbib[title="Twitter", link="https://twitter.com/xbib"]
 
 
-image:https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif[title="PayPal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GVHFQYZ9WZ8HG"]
+# License
 
+Copyright (C) 2018 Jörg Prante
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+you may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+# Donations
+
+Donations are welcome as a small thanks if you find this software useful.
+
+image:https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif[title="PayPal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GVHFQYZ9WZ8HG"]
diff --git a/build.gradle b/build.gradle
index a42a402..b6d086b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 
 plugins {
-    id "org.sonarqube" version "2.5"
+    id "org.sonarqube" version "2.6.1"
     id "org.xbib.gradle.plugin.asciidoctor" version "1.5.4.1.0"
-    id "io.codearte.nexus-staging" version "0.7.0"
+    id "io.codearte.nexus-staging" version "0.11.0"
 }
 
 printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" +
@@ -18,97 +18,110 @@ printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" +
         GroovySystem.getVersion(),
         gradle.gradleVersion
 
-
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'signing'
-apply plugin: 'findbugs'
-apply plugin: 'pmd'
-apply plugin: 'checkstyle'
-apply plugin: "jacoco"
 apply plugin: "io.codearte.nexus-staging"
-apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
-repositories {
-    mavenCentral()
-}
+subprojects {
 
-configurations {
-    asciidoclet
-    wagon
-}
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    apply plugin: 'signing'
+    apply plugin: 'findbugs'
+    apply plugin: 'pmd'
+    apply plugin: 'checkstyle'
+    apply plugin: "jacoco"
+    apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
-dependencies {
-    testCompile "junit:junit:${project.property('junit.version')}"
-    wagon "org.apache.maven.wagon:wagon-ssh-external:2.12"
-    testCompile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
-    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
-    wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
-
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:all" << "-profile" << "compact1"
-}
-
-jar {
-    manifest {
-        attributes('Implementation-Version': project.version)
+    repositories {
+        mavenCentral()
     }
-}
 
-test {
-    testLogging {
-        showStandardStreams = false
-        exceptionFormat = 'full'
+    configurations {
+        asciidoclet
+        wagon
     }
-    systemProperty 'java.net.preferIPv4Stack','false'
-    systemProperty 'java.net.preferIPv6Addresses', 'true'
-}
 
-asciidoctor {
-    backends 'html5'
-    separateOutputDirs = false
-    attributes 'source-highlighter': 'coderay',
-            toc                 : '',
-            idprefix            : '',
-            idseparator         : '-',
-            stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
-}
-
-javadoc {
-    options.docletpath = configurations.asciidoclet.files.asType(List)
-    options.doclet = 'org.asciidoctor.Asciidoclet'
-    options.overview = "src/docs/asciidoclet/overview.adoc"
-    options.addStringOption "-base-dir", "${projectDir}"
-    options.addStringOption "-attribute",
-            "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
-    configure(options) {
-        noTimestamp = true
+    dependencies {
+        testCompile "junit:junit:${project.property('junit.version')}"
+        testCompile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
+        asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
+        wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
     }
-}
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier 'javadoc'
-}
-artifacts {
-    archives sourcesJar, javadocJar
-}
-if (project.hasProperty('signing.keyId')) {
-    signing {
-        sign configurations.archives
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:all" << "-profile" << "compact1"
     }
+
+    jar {
+        manifest {
+            attributes('Implementation-Version': project.version)
+        }
+    }
+
+    clean {
+        delete 'out'
+    }
+
+    test {
+        testLogging {
+            showStandardStreams = false
+            exceptionFormat = 'full'
+        }
+        systemProperty 'java.net.preferIPv4Stack', 'false'
+        systemProperty 'java.net.preferIPv6Addresses', 'true'
+    }
+
+    asciidoctor {
+        attributes 'source-highlighter': 'coderay',
+                toc: 'left',
+                doctype: 'book',
+                icons: 'font',
+                encoding: 'utf-8',
+                sectlink: true,
+                sectanchors: true,
+                linkattrs: true,
+                imagesdir: 'img'
+    }
+
+    javadoc {
+        options.docletpath = configurations.asciidoclet.files.asType(List)
+        options.doclet = 'org.asciidoctor.Asciidoclet'
+        options.overview = "src/docs/asciidoclet/overview.adoc"
+        options.addStringOption "-base-dir", "${projectDir}"
+        options.addStringOption "-attribute",
+                "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
+        configure(options) {
+            noTimestamp = true
+        }
+    }
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier 'javadoc'
+    }
+
+    artifacts {
+        archives sourcesJar, javadocJar
+    }
+
+    if (project.hasProperty('signing.keyId')) {
+        signing {
+            sign configurations.archives
+        }
+    }
+
+    apply from: "${rootProject.projectDir}/gradle/ext.gradle"
+    apply from: "${rootProject.projectDir}/gradle/publish.gradle"
+    apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle"
 }
 
-apply from: "${rootProject.projectDir}/gradle/ext.gradle"
-apply from: "${rootProject.projectDir}/gradle/publish.gradle"
-apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle"
-
+nexusStaging {
+    packageGroup = "org.xbib"
+}
diff --git a/gradle.properties b/gradle.properties
index 77300fa..c3c29cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group = org.xbib
 name = net
-version = 1.0.3
+version = 1.0.4
 
 junit.version = 4.12
 asciidoclet.version = 1.5.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c8f7546..01b8bf6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d1ec295..933b647 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Jul 13 21:48:43 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/net-url/config/checkstyle/checkstyle.xml b/net-url/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..3dc3e16
--- /dev/null
+++ b/net-url/config/checkstyle/checkstyle.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- This is a checkstyle configuration file. For descriptions of
+what the following rules do, please see the checkstyle configuration
+page at http://checkstyle.sourceforge.net/config.html -->
+
+<module name="Checker">
+
+    <module name="FileTabCharacter">
+        <!-- Checks that there are no tab characters in the file.
+        -->
+    </module>
+
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that FIXME is not used in comments.  TODO is preferred.
+        -->
+        <property name="format" value="((//.*)|(\*.*))FIXME" />
+        <property name="message" value='TODO is preferred to FIXME.  e.g. "TODO(johndoe): Refactor when v2 is released."' />
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that TODOs are named.  (Actually, just that they are followed
+             by an open paren.)
+        -->
+        <property name="format" value="((//.*)|(\*.*))TODO[^(]" />
+        <property name="message" value='All TODOs should be named.  e.g. "TODO(johndoe): Refactor when v2 is released."' />
+    </module>
+
+    <module name="JavadocPackage">
+        <!-- Checks that each Java package has a Javadoc file used for commenting.
+          Only allows a package-info.java, not package.html. -->
+    </module>
+
+    <!-- All Java AST specific tests live under TreeWalker module. -->
+    <module name="TreeWalker">
+
+        <!--
+
+        IMPORT CHECKS
+
+        -->
+
+        <module name="RedundantImport">
+            <!-- Checks for redundant import statements. -->
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="ImportOrder">
+            <!-- Checks for out of order import statements. -->
+
+            <property name="severity" value="warning"/>
+            <property name="groups" value="com,io,junit,net,org,javax,java"/>
+            <!-- This ensures that static imports go last. -->
+            <property name="option" value="under"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT"/>
+        </module>
+
+        <!--
+
+        JAVADOC CHECKS
+
+        -->
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod">
+            <property name="scope" value="protected"/>
+            <property name="severity" value="warning"/>
+            <property name="allowMissingJavadoc" value="true"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+            <property name="allowUndeclaredRTE" value="true"/>
+        </module>
+
+        <module name="JavadocType">
+            <property name="scope" value="protected"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="JavadocStyle">
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!--
+
+        NAMING CHECKS
+
+        -->
+
+        <!-- Item 38 - Adhere to generally accepted naming conventions -->
+
+        <module name="PackageName">
+            <!-- Validates identifiers for package names against the
+              supplied expression. -->
+            <!-- Here the default checkstyle rule restricts package name parts to
+              seven characters, this is not in line with common practice at Google.
+            -->
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="TypeNameCheck">
+            <!-- Validates static, final fields against the
+            expression "^[A-Z][a-zA-Z0-9]*$". -->
+            <metadata name="altname" value="TypeName"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ConstantNameCheck">
+            <!-- Validates non-private, static, final fields against the supplied
+            public/package final fields "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+            <metadata name="altname" value="ConstantName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="false"/>
+            <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|FLAG_.*)$"/>
+            <message key="name.invalidPattern"
+                     value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="StaticVariableNameCheck">
+            <!-- Validates static, non-final fields against the supplied
+            expression "^[a-z][a-zA-Z0-9]*_?$". -->
+            <metadata name="altname" value="StaticVariableName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MemberNameCheck">
+            <!-- Validates non-static members against the supplied expression. -->
+            <metadata name="altname" value="MemberName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MethodNameCheck">
+            <!-- Validates identifiers for method names. -->
+            <metadata name="altname" value="MethodName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ParameterName">
+            <!-- Validates identifiers for method parameters against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalFinalVariableName">
+            <!-- Validates identifiers for local final variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalVariableName">
+            <!-- Validates identifiers for local variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+
+        <!--
+
+        LENGTH and CODING CHECKS
+
+        -->
+
+        <module name="LineLength">
+            <!-- Checks if a line is too long. -->
+            <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="128"/>
+            <property name="severity" value="error"/>
+
+            <!--
+              The default ignore pattern exempts the following elements:
+                - import statements
+                - long URLs inside comments
+            -->
+
+            <property name="ignorePattern"
+                      value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+                      default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
+        </module>
+
+        <module name="LeftCurly">
+            <!-- Checks for placement of the left curly brace ('{'). -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="RightCurly">
+            <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+            the same line. e.g., the following example is fine:
+            <pre>
+              if {
+                ...
+              } else
+            </pre>
+            -->
+            <!-- This next example is not fine:
+            <pre>
+              if {
+                ...
+              }
+              else
+            </pre>
+            -->
+            <property name="option" value="same"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!-- Checks for braces around if and else blocks -->
+        <module name="NeedBraces">
+            <property name="severity" value="warning"/>
+            <property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
+        </module>
+
+        <module name="UpperEll">
+            <!-- Checks that long constants are defined with an upper ell.-->
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="FallThrough">
+            <!-- Warn about falling through to the next case statement.  Similar to
+            javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+            on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+            some other variants which we don't publicized to promote consistency).
+            -->
+            <property name="reliefPattern"
+                      value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+            <property name="severity" value="error"/>
+        </module>
+
+
+        <!--
+
+        MODIFIERS CHECKS
+
+        -->
+
+        <module name="ModifierOrder">
+            <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+                 8.4.3.  The prescribed order is:
+                 public, protected, private, abstract, static, final, transient, volatile,
+                 synchronized, native, strictfp
+              -->
+        </module>
+
+
+        <!--
+
+        WHITESPACE CHECKS
+
+        -->
+
+        <module name="WhitespaceAround">
+            <!-- Checks that various tokens are surrounded by whitespace.
+                 This includes most binary operators and keywords followed
+                 by regular or curly braces.
+            -->
+            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="WhitespaceAfter">
+            <!-- Checks that commas, semicolons and typecasts are followed by
+                 whitespace.
+            -->
+            <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+        </module>
+
+        <module name="NoWhitespaceAfter">
+            <!-- Checks that there is no whitespace after various unary operators.
+                 Linebreaks are allowed.
+            -->
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+            <property name="allowLineBreaks" value="true"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="NoWhitespaceBefore">
+            <!-- Checks that there is no whitespace before various unary operators.
+                 Linebreaks are allowed.
+            -->
+            <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+            <property name="allowLineBreaks" value="true"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="ParenPad">
+            <!-- Checks that there is no whitespace before close parens or after
+                 open parens.
+            -->
+            <property name="severity" value="warning"/>
+        </module>
+
+    </module>
+</module>
+
diff --git a/src/docs/asciidoc/css/foundation.css b/net-url/src/docs/asciidoc/css/foundation.css
similarity index 100%
rename from src/docs/asciidoc/css/foundation.css
rename to net-url/src/docs/asciidoc/css/foundation.css
diff --git a/src/docs/asciidoc/index.adoc b/net-url/src/docs/asciidoc/index.adoc
similarity index 100%
rename from src/docs/asciidoc/index.adoc
rename to net-url/src/docs/asciidoc/index.adoc
diff --git a/src/docs/asciidoclet/overview.adoc b/net-url/src/docs/asciidoclet/overview.adoc
similarity index 100%
rename from src/docs/asciidoclet/overview.adoc
rename to net-url/src/docs/asciidoclet/overview.adoc
diff --git a/src/main/java/org/xbib/net/PercentDecoder.java b/net-url/src/main/java/org/xbib/net/PercentDecoder.java
similarity index 100%
rename from src/main/java/org/xbib/net/PercentDecoder.java
rename to net-url/src/main/java/org/xbib/net/PercentDecoder.java
diff --git a/src/main/java/org/xbib/net/PercentEncoder.java b/net-url/src/main/java/org/xbib/net/PercentEncoder.java
similarity index 100%
rename from src/main/java/org/xbib/net/PercentEncoder.java
rename to net-url/src/main/java/org/xbib/net/PercentEncoder.java
diff --git a/src/main/java/org/xbib/net/PercentEncoders.java b/net-url/src/main/java/org/xbib/net/PercentEncoders.java
similarity index 100%
rename from src/main/java/org/xbib/net/PercentEncoders.java
rename to net-url/src/main/java/org/xbib/net/PercentEncoders.java
diff --git a/src/main/java/org/xbib/net/ProtocolVersion.java b/net-url/src/main/java/org/xbib/net/ProtocolVersion.java
similarity index 100%
rename from src/main/java/org/xbib/net/ProtocolVersion.java
rename to net-url/src/main/java/org/xbib/net/ProtocolVersion.java
diff --git a/src/main/java/org/xbib/net/QueryParameters.java b/net-url/src/main/java/org/xbib/net/QueryParameters.java
similarity index 100%
rename from src/main/java/org/xbib/net/QueryParameters.java
rename to net-url/src/main/java/org/xbib/net/QueryParameters.java
diff --git a/src/main/java/org/xbib/net/URL.java b/net-url/src/main/java/org/xbib/net/URL.java
similarity index 100%
rename from src/main/java/org/xbib/net/URL.java
rename to net-url/src/main/java/org/xbib/net/URL.java
diff --git a/src/main/java/org/xbib/net/URLSyntaxException.java b/net-url/src/main/java/org/xbib/net/URLSyntaxException.java
similarity index 100%
rename from src/main/java/org/xbib/net/URLSyntaxException.java
rename to net-url/src/main/java/org/xbib/net/URLSyntaxException.java
diff --git a/src/main/java/org/xbib/net/matcher/CharMatcher.java b/net-url/src/main/java/org/xbib/net/matcher/CharMatcher.java
similarity index 100%
rename from src/main/java/org/xbib/net/matcher/CharMatcher.java
rename to net-url/src/main/java/org/xbib/net/matcher/CharMatcher.java
diff --git a/src/main/java/org/xbib/net/matcher/package-info.java b/net-url/src/main/java/org/xbib/net/matcher/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/matcher/package-info.java
rename to net-url/src/main/java/org/xbib/net/matcher/package-info.java
diff --git a/src/main/java/org/xbib/net/package-info.java b/net-url/src/main/java/org/xbib/net/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/package-info.java
rename to net-url/src/main/java/org/xbib/net/package-info.java
diff --git a/src/main/java/org/xbib/net/path/PathDecoder.java b/net-url/src/main/java/org/xbib/net/path/PathDecoder.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathDecoder.java
rename to net-url/src/main/java/org/xbib/net/path/PathDecoder.java
diff --git a/src/main/java/org/xbib/net/path/PathMatcher.java b/net-url/src/main/java/org/xbib/net/path/PathMatcher.java
similarity index 99%
rename from src/main/java/org/xbib/net/path/PathMatcher.java
rename to net-url/src/main/java/org/xbib/net/path/PathMatcher.java
index c45c1f9..c1dae20 100644
--- a/src/main/java/org/xbib/net/path/PathMatcher.java
+++ b/net-url/src/main/java/org/xbib/net/path/PathMatcher.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
+ *
  */
 public class PathMatcher {
 
diff --git a/src/main/java/org/xbib/net/path/PathNormalizer.java b/net-url/src/main/java/org/xbib/net/path/PathNormalizer.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathNormalizer.java
rename to net-url/src/main/java/org/xbib/net/path/PathNormalizer.java
diff --git a/src/main/java/org/xbib/net/path/PathPatternComparator.java b/net-url/src/main/java/org/xbib/net/path/PathPatternComparator.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathPatternComparator.java
rename to net-url/src/main/java/org/xbib/net/path/PathPatternComparator.java
diff --git a/src/main/java/org/xbib/net/path/PathPatternInfo.java b/net-url/src/main/java/org/xbib/net/path/PathPatternInfo.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathPatternInfo.java
rename to net-url/src/main/java/org/xbib/net/path/PathPatternInfo.java
diff --git a/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java b/net-url/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java
rename to net-url/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java
diff --git a/src/main/java/org/xbib/net/path/PathStringMatcher.java b/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/PathStringMatcher.java
rename to net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java
diff --git a/src/main/java/org/xbib/net/path/package-info.java b/net-url/src/main/java/org/xbib/net/path/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/path/package-info.java
rename to net-url/src/main/java/org/xbib/net/path/package-info.java
diff --git a/src/main/java/org/xbib/net/scheme/AbstractScheme.java b/net-url/src/main/java/org/xbib/net/scheme/AbstractScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/AbstractScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/AbstractScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/DefaultScheme.java b/net-url/src/main/java/org/xbib/net/scheme/DefaultScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/DefaultScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/DefaultScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/DnsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/DnsScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/DnsScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/DnsScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/FileScheme.java b/net-url/src/main/java/org/xbib/net/scheme/FileScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/FileScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/FileScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/FtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/FtpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/FtpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/FtpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/GitScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GitScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/GitScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/GitScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/GopherScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GopherScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/GopherScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/GopherScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/HttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java
similarity index 76%
rename from src/main/java/org/xbib/net/scheme/HttpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java
index 60266c5..5a70002 100644
--- a/src/main/java/org/xbib/net/scheme/HttpScheme.java
+++ b/net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java
@@ -28,8 +28,8 @@ class HttpScheme extends AbstractScheme {
                 .host(host, url.getProtocolVersion())
                 .port(url.getPort())
                 .path(PathNormalizer.normalize(url.getPath()))
-                .query(url.getQuery()/*PercentEncoders.getQueryEncoder().encode(url.getDecodedQuery())*/)
-                .fragment(url.getFragment()/*PercentEncoders.getFragmentEncoder().encode(url.getDecodedFragment())*/)
+                .query(url.getQuery())
+                .fragment(url.getFragment())
                 .build();
     }
 }
diff --git a/src/main/java/org/xbib/net/scheme/ImapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/ImapScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/ImapScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/ImapScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/IrcScheme.java b/net-url/src/main/java/org/xbib/net/scheme/IrcScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/IrcScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/IrcScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/LdapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/LdapScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/LdapScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/LdapScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/MailtoScheme.java b/net-url/src/main/java/org/xbib/net/scheme/MailtoScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/MailtoScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/MailtoScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/NewsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/NewsScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/NewsScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/NewsScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/NntpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/NntpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/NntpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/NntpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/Pop3Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/Pop3Scheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/Pop3Scheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/Pop3Scheme.java
diff --git a/src/main/java/org/xbib/net/scheme/RedisScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RedisScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/RedisScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/RedisScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/RsyncScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RsyncScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/RsyncScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/RsyncScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/RtmpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RtmpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/RtmpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/RtmpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/RtspScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RtspScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/RtspScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/RtspScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/Scheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/Scheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/Scheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SchemeRegistry.java b/net-url/src/main/java/org/xbib/net/scheme/SchemeRegistry.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SchemeRegistry.java
rename to net-url/src/main/java/org/xbib/net/scheme/SchemeRegistry.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureHttpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureImapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureImapScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureImapScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureImapScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureLdapScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureNewsScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SftpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SftpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SftpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SftpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SmtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SmtpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SmtpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SmtpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/SshScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SshScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/SshScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/SshScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/TelnetScheme.java b/net-url/src/main/java/org/xbib/net/scheme/TelnetScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/TelnetScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/TelnetScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/TftpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/TftpScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/TftpScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/TftpScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/UrnScheme.java b/net-url/src/main/java/org/xbib/net/scheme/UrnScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/UrnScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/UrnScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/WebSocketScheme.java b/net-url/src/main/java/org/xbib/net/scheme/WebSocketScheme.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/WebSocketScheme.java
rename to net-url/src/main/java/org/xbib/net/scheme/WebSocketScheme.java
diff --git a/src/main/java/org/xbib/net/scheme/package-info.java b/net-url/src/main/java/org/xbib/net/scheme/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/scheme/package-info.java
rename to net-url/src/main/java/org/xbib/net/scheme/package-info.java
diff --git a/src/main/java/org/xbib/net/template/URITemplate.java b/net-url/src/main/java/org/xbib/net/template/URITemplate.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/URITemplate.java
rename to net-url/src/main/java/org/xbib/net/template/URITemplate.java
diff --git a/src/main/java/org/xbib/net/template/expression/ExpressionType.java b/net-url/src/main/java/org/xbib/net/template/expression/ExpressionType.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/expression/ExpressionType.java
rename to net-url/src/main/java/org/xbib/net/template/expression/ExpressionType.java
diff --git a/src/main/java/org/xbib/net/template/expression/TemplateExpression.java b/net-url/src/main/java/org/xbib/net/template/expression/TemplateExpression.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/expression/TemplateExpression.java
rename to net-url/src/main/java/org/xbib/net/template/expression/TemplateExpression.java
diff --git a/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java b/net-url/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/expression/TemplateLiteral.java
rename to net-url/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java
diff --git a/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java b/net-url/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/expression/URITemplateExpression.java
rename to net-url/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java
diff --git a/src/main/java/org/xbib/net/template/expression/package-info.java b/net-url/src/main/java/org/xbib/net/template/expression/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/expression/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/expression/package-info.java
diff --git a/src/main/java/org/xbib/net/template/package-info.java b/net-url/src/main/java/org/xbib/net/template/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/package-info.java
diff --git a/src/main/java/org/xbib/net/template/parse/ExpressionParser.java b/net-url/src/main/java/org/xbib/net/template/parse/ExpressionParser.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/ExpressionParser.java
rename to net-url/src/main/java/org/xbib/net/template/parse/ExpressionParser.java
diff --git a/src/main/java/org/xbib/net/template/parse/LiteralParser.java b/net-url/src/main/java/org/xbib/net/template/parse/LiteralParser.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/LiteralParser.java
rename to net-url/src/main/java/org/xbib/net/template/parse/LiteralParser.java
diff --git a/src/main/java/org/xbib/net/template/parse/TemplateParser.java b/net-url/src/main/java/org/xbib/net/template/parse/TemplateParser.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/TemplateParser.java
rename to net-url/src/main/java/org/xbib/net/template/parse/TemplateParser.java
diff --git a/src/main/java/org/xbib/net/template/parse/URITemplateParser.java b/net-url/src/main/java/org/xbib/net/template/parse/URITemplateParser.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/URITemplateParser.java
rename to net-url/src/main/java/org/xbib/net/template/parse/URITemplateParser.java
diff --git a/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java b/net-url/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/VariableSpecParser.java
rename to net-url/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java
diff --git a/src/main/java/org/xbib/net/template/parse/package-info.java b/net-url/src/main/java/org/xbib/net/template/parse/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/parse/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/parse/package-info.java
diff --git a/src/main/java/org/xbib/net/template/render/ListRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/ListRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/ListRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/ListRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/MapRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/MapRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/MapRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/MapRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/MultiValueRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/NullRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/NullRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/NullRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/NullRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/StringRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/StringRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/StringRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/StringRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/ValueRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/ValueRenderer.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/ValueRenderer.java
rename to net-url/src/main/java/org/xbib/net/template/render/ValueRenderer.java
diff --git a/src/main/java/org/xbib/net/template/render/package-info.java b/net-url/src/main/java/org/xbib/net/template/render/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/render/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/render/package-info.java
diff --git a/src/main/java/org/xbib/net/template/vars/Variables.java b/net-url/src/main/java/org/xbib/net/template/vars/Variables.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/Variables.java
rename to net-url/src/main/java/org/xbib/net/template/vars/Variables.java
diff --git a/src/main/java/org/xbib/net/template/vars/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/vars/package-info.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java
diff --git a/src/main/java/org/xbib/net/template/vars/specs/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/specs/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/vars/specs/package-info.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/ListValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ListValue.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/ListValue.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/ListValue.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/MapValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/MapValue.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/MapValue.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/MapValue.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/NullValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/NullValue.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/NullValue.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/NullValue.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/ScalarValue.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/ValueType.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ValueType.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/ValueType.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/ValueType.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/VariableValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/VariableValue.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/VariableValue.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/VariableValue.java
diff --git a/src/main/java/org/xbib/net/template/vars/values/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/values/package-info.java
similarity index 100%
rename from src/main/java/org/xbib/net/template/vars/values/package-info.java
rename to net-url/src/main/java/org/xbib/net/template/vars/values/package-info.java
diff --git a/src/test/java/org/xbib/net/IRITest.java b/net-url/src/test/java/org/xbib/net/IRITest.java
similarity index 100%
rename from src/test/java/org/xbib/net/IRITest.java
rename to net-url/src/test/java/org/xbib/net/IRITest.java
diff --git a/src/test/java/org/xbib/net/PercentDecoderTest.java b/net-url/src/test/java/org/xbib/net/PercentDecoderTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/PercentDecoderTest.java
rename to net-url/src/test/java/org/xbib/net/PercentDecoderTest.java
diff --git a/src/test/java/org/xbib/net/PercentEncoderTest.java b/net-url/src/test/java/org/xbib/net/PercentEncoderTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/PercentEncoderTest.java
rename to net-url/src/test/java/org/xbib/net/PercentEncoderTest.java
diff --git a/src/test/java/org/xbib/net/URIComponentTest.java b/net-url/src/test/java/org/xbib/net/URIComponentTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/URIComponentTest.java
rename to net-url/src/test/java/org/xbib/net/URIComponentTest.java
diff --git a/src/test/java/org/xbib/net/URLBuilderTest.java b/net-url/src/test/java/org/xbib/net/URLBuilderTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/URLBuilderTest.java
rename to net-url/src/test/java/org/xbib/net/URLBuilderTest.java
diff --git a/src/test/java/org/xbib/net/URLParserTest.java b/net-url/src/test/java/org/xbib/net/URLParserTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/URLParserTest.java
rename to net-url/src/test/java/org/xbib/net/URLParserTest.java
diff --git a/src/test/java/org/xbib/net/URLResolverTest.java b/net-url/src/test/java/org/xbib/net/URLResolverTest.java
similarity index 91%
rename from src/test/java/org/xbib/net/URLResolverTest.java
rename to net-url/src/test/java/org/xbib/net/URLResolverTest.java
index 929cf56..9c33b8b 100644
--- a/src/test/java/org/xbib/net/URLResolverTest.java
+++ b/net-url/src/test/java/org/xbib/net/URLResolverTest.java
@@ -34,6 +34,16 @@ public class URLResolverTest {
         assertEquals("http://example.org/foo/foobar", base.resolve("foobar").toString());
     }
 
+    @Test
+    public void testMultiResolve() throws Exception {
+        URL base = URL.create("http://example:8080");
+        String pathSpec = "foobar/";
+        String index = "index.html";
+        String queryString = "a=b";
+        URL url = base.resolve(pathSpec).resolve(index).newBuilder().query(queryString).build().normalize();
+        assertEquals("http://example:8080/foobar/index.html?a=b", url.toString());
+    }
+
     @Test
     public void testFielding() throws Exception {
         // http://www.ics.uci.edu/~fielding/url/test1.html
diff --git a/src/test/java/org/xbib/net/URLTest.java b/net-url/src/test/java/org/xbib/net/URLTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/URLTest.java
rename to net-url/src/test/java/org/xbib/net/URLTest.java
diff --git a/src/test/java/org/xbib/net/package-info.java b/net-url/src/test/java/org/xbib/net/package-info.java
similarity index 100%
rename from src/test/java/org/xbib/net/package-info.java
rename to net-url/src/test/java/org/xbib/net/package-info.java
diff --git a/src/test/java/org/xbib/net/path/PathDecoderTest.java b/net-url/src/test/java/org/xbib/net/path/PathDecoderTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/path/PathDecoderTest.java
rename to net-url/src/test/java/org/xbib/net/path/PathDecoderTest.java
diff --git a/src/test/java/org/xbib/net/path/PathMatcherTest.java b/net-url/src/test/java/org/xbib/net/path/PathMatcherTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/path/PathMatcherTest.java
rename to net-url/src/test/java/org/xbib/net/path/PathMatcherTest.java
diff --git a/src/test/java/org/xbib/net/path/PathNormalizerTest.java b/net-url/src/test/java/org/xbib/net/path/PathNormalizerTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/path/PathNormalizerTest.java
rename to net-url/src/test/java/org/xbib/net/path/PathNormalizerTest.java
diff --git a/src/test/java/org/xbib/net/path/package-info.java b/net-url/src/test/java/org/xbib/net/path/package-info.java
similarity index 100%
rename from src/test/java/org/xbib/net/path/package-info.java
rename to net-url/src/test/java/org/xbib/net/path/package-info.java
diff --git a/src/test/java/org/xbib/net/template/URITemplateTest.java b/net-url/src/test/java/org/xbib/net/template/URITemplateTest.java
similarity index 100%
rename from src/test/java/org/xbib/net/template/URITemplateTest.java
rename to net-url/src/test/java/org/xbib/net/template/URITemplateTest.java
diff --git a/src/test/java/org/xbib/net/template/package-info.java b/net-url/src/test/java/org/xbib/net/template/package-info.java
similarity index 100%
rename from src/test/java/org/xbib/net/template/package-info.java
rename to net-url/src/test/java/org/xbib/net/template/package-info.java
diff --git a/src/test/resources/extended-tests.json b/net-url/src/test/resources/extended-tests.json
similarity index 100%
rename from src/test/resources/extended-tests.json
rename to net-url/src/test/resources/extended-tests.json
diff --git a/src/test/resources/lists.json b/net-url/src/test/resources/lists.json
similarity index 100%
rename from src/test/resources/lists.json
rename to net-url/src/test/resources/lists.json
diff --git a/src/test/resources/multipleLists.json b/net-url/src/test/resources/multipleLists.json
similarity index 100%
rename from src/test/resources/multipleLists.json
rename to net-url/src/test/resources/multipleLists.json
diff --git a/src/test/resources/multipleStrings.json b/net-url/src/test/resources/multipleStrings.json
similarity index 100%
rename from src/test/resources/multipleStrings.json
rename to net-url/src/test/resources/multipleStrings.json
diff --git a/src/test/resources/negative-tests.json b/net-url/src/test/resources/negative-tests.json
similarity index 100%
rename from src/test/resources/negative-tests.json
rename to net-url/src/test/resources/negative-tests.json
diff --git a/src/test/resources/rfcExamples.json b/net-url/src/test/resources/rfcExamples.json
similarity index 100%
rename from src/test/resources/rfcExamples.json
rename to net-url/src/test/resources/rfcExamples.json
diff --git a/src/test/resources/spec-examples-by-section.json b/net-url/src/test/resources/spec-examples-by-section.json
similarity index 100%
rename from src/test/resources/spec-examples-by-section.json
rename to net-url/src/test/resources/spec-examples-by-section.json
diff --git a/src/test/resources/spec-examples.json b/net-url/src/test/resources/spec-examples.json
similarity index 100%
rename from src/test/resources/spec-examples.json
rename to net-url/src/test/resources/spec-examples.json
diff --git a/src/test/resources/strings.json b/net-url/src/test/resources/strings.json
similarity index 100%
rename from src/test/resources/strings.json
rename to net-url/src/test/resources/strings.json
diff --git a/src/test/resources/urltestdata.json b/net-url/src/test/resources/urltestdata.json
similarity index 100%
rename from src/test/resources/urltestdata.json
rename to net-url/src/test/resources/urltestdata.json
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..a32c64d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,3 @@
+rootProject.name = name
+
+include 'net-url'