310 files changed, 697 insertions, 2329 deletions

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f80c40fc..3d03cd3a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,7 +9,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/dokka-fatjar" />
+            <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/dokka-gradle-plugin" />
           </set>
         </option>
@@ -17,7 +17,7 @@
         <option name="myModules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/dokka-fatjar" />
+            <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/dokka-gradle-plugin" />
           </set>
         </option>
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
index 94e97890..8262f729 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="libraryTable">
   <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml
deleted file mode 100644
index c023c035..00000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml
deleted file mode 100644
index 1319bd53..00000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_google_inject_guice_4_0.xml b/.idea/libraries/com_google_inject_guice_4_0.xml
index 99d2a5e4..75541478 100644
--- a/.idea/libraries/com_google_inject_guice_4_0.xml
+++ b/.idea/libraries/com_google_inject_guice_4_0.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="libraryTable">
   <library name="com.google.inject:guice:4.0" type="repository">
     <properties maven-id="com.google.inject:guice:4.0" />
@@ -6,6 +5,10 @@
       <root url="jar://$PROJECT_DIR$/lib/guice-4.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/javax.inject-1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/aopalliance-1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guice-4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.inject-1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/aopalliance-1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-16.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/junit_junit_4_11.xml b/.idea/libraries/junit_junit_4_11.xml
index fae06116..e9bebbd2 100644
--- a/.idea/libraries/junit_junit_4_11.xml
+++ b/.idea/libraries/junit_junit_4_11.xml
@@ -4,12 +4,16 @@
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/junit-4.11.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-4.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$PROJECT_DIR$/lib/junit-4.11-javadoc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-4.11-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/lib/junit-4.11-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-4.11-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6fe6cd09..0f91bc27 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,12 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
+      <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
       <module fileurl="file://$PROJECT_DIR$/dokka.iml" filepath="$PROJECT_DIR$/dokka.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dokka-fatjar/dokka-fatjar.iml" filepath="$PROJECT_DIR$/dokka-fatjar/dokka-fatjar.iml" />
       <module fileurl="file://$PROJECT_DIR$/dokka-gradle-plugin/dokka-gradle-plugin.iml" filepath="$PROJECT_DIR$/dokka-gradle-plugin/dokka-gradle-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/maven-plugin/dokka-maven-plugin.iml" filepath="$PROJECT_DIR$/maven-plugin/dokka-maven-plugin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/javadoc/javadoc.iml" filepath="$PROJECT_DIR$/javadoc/javadoc.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 20620baa..6c261adb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/ant/ant.iml b/ant/ant.iml
deleted file mode 100644
index 0761035c..00000000
--- a/ant/ant.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin" level="project" />
-    <orderEntry type="library" name="ant-1.9.4" level="project" />
-    <orderEntry type="module" module-name="dokka" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/build-docs.xml b/build-docs.xml
index a11200f4..71d4c19f 100644
--- a/build-docs.xml
+++ b/build-docs.xml
@@ -1,11 +1,15 @@
 <project name="Dokka" default="document">
     <!-- Demonstrates the usage of the Dokka Ant task. Assumes Dokka has already been compiled -->
 
-    <typedef resource="dokka-antlib.xml" classpath="out/artifacts/dokka.jar"/>
+    <typedef resource="dokka-antlib.xml">
+        <classpath>
+            <fileset dir="core/build/libs" includes="dokka-fatjar-*.jar"/>
+        </classpath>
+    </typedef>
 
     <target name="document">
-        <dokka src="src" outputdir="doc" modulename="dokka">
-            <sourcelink path="." url="https://github.com/orangy/dokka/blob/master" linesuffix="#L"/>
+        <dokka src="core/src/main/kotlin" outputdir="doc" modulename="dokka">
+            <sourcelink path="." url="https://github.com/kotlin/dokka/blob/master" linesuffix="#L"/>
         </dokka>
     </target>
 </project>
diff --git a/build.xml b/build.xml
index 80c3029d..9629623c 100644
--- a/build.xml
+++ b/build.xml
@@ -30,7 +30,7 @@
         </kotlinc>
 
         <jar jarfile="out/dokka.jar" update="true" >
-            <zipfileset dir="resources" includes="**/*.properties"/>
+            <zipfileset dir="core/src/main/resources" includes="**/*.properties"/>
             <zipfileset dir="javadoc/src/main/resources" includes="**/*.properties"/>
         </jar>
 
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 00000000..49d6d4d6
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,103 @@
+import javax.tools.ToolProvider
+
+group 'org.jetbrains.dokka'
+version dokka_version
+
+buildscript {
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
+    }
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
+
+sourceCompatibility = 1.5
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    provided
+}
+
+dependencies {
+    compile "com.google.inject:guice:4.0"
+    compile "com.github.spullara.cli-parser:cli-parser:1.1.1"
+    compile "org.jsoup:jsoup:1.8.3"
+
+    compile files("../lib/intellij-core-analysis.jar")
+    compile files("../lib/kotlin-for-upsource.jar")
+    compile files("../lib/markdown.jar")
+    compile files("../lib/picocontainer.jar")
+
+    provided files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") })
+    provided "org.apache.ant:ant:1.9.6"
+
+    runtime "org.fusesource.jansi:jansi:1.11"
+
+    runtime files("../lib/trove4j.jar")
+    runtime files("../lib/jdom.jar")
+    runtime files("../lib/protobuf-2.5.0-lite.jar")
+    runtime files("../lib/asm-all.jar")
+    runtime files("../lib/jps-model.jar")
+
+    testCompile group: 'junit', name: 'junit', version: '4.11'
+}
+
+tasks.withType(AbstractCompile) {
+    classpath += configurations.provided
+}
+
+tasks.withType(Test) {
+    classpath += configurations.provided
+}
+
+jar {
+    manifest {
+        attributes "Implementation-Title": "Dokka Kotlin Documentation tool"
+        attributes "Implementation-Version": version
+        attributes "Main-Class": "org.jetbrains.dokka.MainKt"
+    }
+}
+
+shadowJar {
+    baseName = 'dokka-fatjar'
+    classifier = ''
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) {
+            from components.shadow
+            artifactId = 'dokka-fatjar'
+        }
+    }
+}
+
+bintray {
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_KEY')
+
+    pkg {
+        repo = 'dokka'
+        name = 'dokka'
+        userOrg = 'kotlin'
+        desc = 'Dokka, the Kotlin documentation tool'
+        vcsUrl = 'https://github.com/kotlin/dokka.git'
+        licenses = ['Apache-2.0']
+        version {
+            name = dokka_version
+        }
+    }
+
+    publications = ['shadow']
+}
diff --git a/javadoc/gradlew b/core/gradlew
index 91a7e269..91a7e269 100755
--- a/javadoc/gradlew
+++ b/core/gradlew
diff --git a/javadoc/gradlew.bat b/core/gradlew.bat
index 8a0b282a..8a0b282a 100644
--- a/javadoc/gradlew.bat
+++ b/core/gradlew.bat
diff --git a/core/settings.gradle b/core/settings.gradle
new file mode 100644
index 00000000..17bdad4c
--- /dev/null
+++ b/core/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'core'
+
diff --git a/src/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
index a5e35a0e..a5e35a0e 100644
--- a/src/Analysis/AnalysisEnvironment.kt
+++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
diff --git a/src/Analysis/CoreProjectFileIndex.kt b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
index a1362fde..a1362fde 100644
--- a/src/Analysis/CoreProjectFileIndex.kt
+++ b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
diff --git a/src/Formats/FormatDescriptor.kt b/core/src/main/kotlin/Formats/FormatDescriptor.kt
index 0c7ca794..0c7ca794 100644
--- a/src/Formats/FormatDescriptor.kt
+++ b/core/src/main/kotlin/Formats/FormatDescriptor.kt
diff --git a/src/Formats/FormatService.kt b/core/src/main/kotlin/Formats/FormatService.kt
index 7e66a6b7..7e66a6b7 100644
--- a/src/Formats/FormatService.kt
+++ b/core/src/main/kotlin/Formats/FormatService.kt
diff --git a/src/Formats/HtmlFormatService.kt b/core/src/main/kotlin/Formats/HtmlFormatService.kt
index 2c461905..4d45e6cb 100644
--- a/src/Formats/HtmlFormatService.kt
+++ b/core/src/main/kotlin/Formats/HtmlFormatService.kt
@@ -3,6 +3,7 @@ package org.jetbrains.dokka
 import com.google.inject.Inject
 import com.google.inject.name.Named
 import java.io.File
+import java.nio.file.Path
 import java.nio.file.Paths
 
 public open class HtmlFormatService @Inject constructor(@Named("folders") locationService: LocationService,
@@ -125,7 +126,10 @@ public open class HtmlFormatService @Inject constructor(@Named("folders") locati
         templateService.appendFooter(to)
     }
 
-    private fun calcPathToRoot(location: Location) = Paths.get(location.path).parent.relativize(Paths.get(locationService.root.path + '/'))
+    private fun calcPathToRoot(location: Location): Path {
+        val path = Paths.get(location.path)
+        return path.parent?.relativize(Paths.get(locationService.root.path + '/')) ?: path
+    }
 
     override fun getOutlineFileName(location: Location): File {
         return File("${location.path}-outline.html")
diff --git a/src/Formats/HtmlTemplateService.kt b/core/src/main/kotlin/Formats/HtmlTemplateService.kt
index ae42a31b..ae42a31b 100644
--- a/src/Formats/HtmlTemplateService.kt
+++ b/core/src/main/kotlin/Formats/HtmlTemplateService.kt
diff --git a/src/Formats/JekyllFormatService.kt b/core/src/main/kotlin/Formats/JekyllFormatService.kt
index f81257d6..f81257d6 100644
--- a/src/Formats/JekyllFormatService.kt
+++ b/core/src/main/kotlin/Formats/JekyllFormatService.kt
diff --git a/src/Formats/KotlinWebsiteFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
index 4eda7910..4eda7910 100644
--- a/src/Formats/KotlinWebsiteFormatService.kt
+++ b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
diff --git a/src/Formats/MarkdownFormatService.kt b/core/src/main/kotlin/Formats/MarkdownFormatService.kt
index f694ae3e..f694ae3e 100644
--- a/src/Formats/MarkdownFormatService.kt
+++ b/core/src/main/kotlin/Formats/MarkdownFormatService.kt
diff --git a/src/Formats/OutlineService.kt b/core/src/main/kotlin/Formats/OutlineService.kt
index 6626cf51..6626cf51 100644
--- a/src/Formats/OutlineService.kt
+++ b/core/src/main/kotlin/Formats/OutlineService.kt
diff --git a/src/Formats/StandardFormats.kt b/core/src/main/kotlin/Formats/StandardFormats.kt
index 94e1b115..94e1b115 100644
--- a/src/Formats/StandardFormats.kt
+++ b/core/src/main/kotlin/Formats/StandardFormats.kt
diff --git a/src/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index 32a2b68a..32a2b68a 100644
--- a/src/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
diff --git a/src/Formats/YamlOutlineService.kt b/core/src/main/kotlin/Formats/YamlOutlineService.kt
index 7968824c..7968824c 100644
--- a/src/Formats/YamlOutlineService.kt
+++ b/core/src/main/kotlin/Formats/YamlOutlineService.kt
diff --git a/src/Generation/ConsoleGenerator.kt b/core/src/main/kotlin/Generation/ConsoleGenerator.kt
index 803a16e4..803a16e4 100644
--- a/src/Generation/ConsoleGenerator.kt
+++ b/core/src/main/kotlin/Generation/ConsoleGenerator.kt
diff --git a/src/Generation/FileGenerator.kt b/core/src/main/kotlin/Generation/FileGenerator.kt
index a762bae3..a762bae3 100644
--- a/src/Generation/FileGenerator.kt
+++ b/core/src/main/kotlin/Generation/FileGenerator.kt
diff --git a/src/Generation/Generator.kt b/core/src/main/kotlin/Generation/Generator.kt
index ac10a6a5..ac10a6a5 100644
--- a/src/Generation/Generator.kt
+++ b/core/src/main/kotlin/Generation/Generator.kt
diff --git a/src/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
index 3c9875cd..3c9875cd 100644
--- a/src/Java/JavaPsiDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
diff --git a/src/Java/JavadocParser.kt b/core/src/main/kotlin/Java/JavadocParser.kt
index 1378a5a7..1378a5a7 100644
--- a/src/Java/JavadocParser.kt
+++ b/core/src/main/kotlin/Java/JavadocParser.kt
diff --git a/src/Kotlin/ContentBuilder.kt b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
index c4bb18de..c4bb18de 100644
--- a/src/Kotlin/ContentBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
diff --git a/src/Kotlin/DeclarationLinkResolver.kt b/core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
index 2569bc71..2569bc71 100644
--- a/src/Kotlin/DeclarationLinkResolver.kt
+++ b/core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
diff --git a/src/Kotlin/DescriptorDocumentationParser.kt b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt
index b7705ec9..b7705ec9 100644
--- a/src/Kotlin/DescriptorDocumentationParser.kt
+++ b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt
diff --git a/src/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 6551ded6..6551ded6 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
diff --git a/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt
index 7a1d591c..7a1d591c 100644
--- a/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt
diff --git a/src/Kotlin/KotlinLanguageService.kt b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
index 0d39f410..0d39f410 100644
--- a/src/Kotlin/KotlinLanguageService.kt
+++ b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
diff --git a/src/Languages/JavaLanguageService.kt b/core/src/main/kotlin/Languages/JavaLanguageService.kt
index 7e40beff..7e40beff 100644
--- a/src/Languages/JavaLanguageService.kt
+++ b/core/src/main/kotlin/Languages/JavaLanguageService.kt
diff --git a/src/Languages/LanguageService.kt b/core/src/main/kotlin/Languages/LanguageService.kt
index b0f4bbc9..b0f4bbc9 100644
--- a/src/Languages/LanguageService.kt
+++ b/core/src/main/kotlin/Languages/LanguageService.kt
diff --git a/src/Locations/FoldersLocationService.kt b/core/src/main/kotlin/Locations/FoldersLocationService.kt
index 89b34ed1..89b34ed1 100644
--- a/src/Locations/FoldersLocationService.kt
+++ b/core/src/main/kotlin/Locations/FoldersLocationService.kt
diff --git a/src/Locations/LocationService.kt b/core/src/main/kotlin/Locations/LocationService.kt
index 80bc0236..80bc0236 100644
--- a/src/Locations/LocationService.kt
+++ b/core/src/main/kotlin/Locations/LocationService.kt
diff --git a/src/Locations/SingleFolderLocationService.kt b/core/src/main/kotlin/Locations/SingleFolderLocationService.kt
index e313ac28..e313ac28 100644
--- a/src/Locations/SingleFolderLocationService.kt
+++ b/core/src/main/kotlin/Locations/SingleFolderLocationService.kt
diff --git a/src/Markdown/MarkdownProcessor.kt b/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
index 99caddc4..99caddc4 100644
--- a/src/Markdown/MarkdownProcessor.kt
+++ b/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
diff --git a/src/Model/Content.kt b/core/src/main/kotlin/Model/Content.kt
index 6556b09e..6556b09e 100644
--- a/src/Model/Content.kt
+++ b/core/src/main/kotlin/Model/Content.kt
diff --git a/src/Model/DocumentationNode.kt b/core/src/main/kotlin/Model/DocumentationNode.kt
index 52881f65..52881f65 100644
--- a/src/Model/DocumentationNode.kt
+++ b/core/src/main/kotlin/Model/DocumentationNode.kt
diff --git a/src/Model/DocumentationReference.kt b/core/src/main/kotlin/Model/DocumentationReference.kt
index 898c92d7..898c92d7 100644
--- a/src/Model/DocumentationReference.kt
+++ b/core/src/main/kotlin/Model/DocumentationReference.kt
diff --git a/src/Model/PackageDocs.kt b/core/src/main/kotlin/Model/PackageDocs.kt
index 044c73d8..044c73d8 100644
--- a/src/Model/PackageDocs.kt
+++ b/core/src/main/kotlin/Model/PackageDocs.kt
diff --git a/src/Model/SourceLinks.kt b/core/src/main/kotlin/Model/SourceLinks.kt
index 956bfe4b..956bfe4b 100644
--- a/src/Model/SourceLinks.kt
+++ b/core/src/main/kotlin/Model/SourceLinks.kt
diff --git a/src/Utilities/DokkaModule.kt b/core/src/main/kotlin/Utilities/DokkaModule.kt
index 1eb82313..1eb82313 100644
--- a/src/Utilities/DokkaModule.kt
+++ b/core/src/main/kotlin/Utilities/DokkaModule.kt
diff --git a/src/Utilities/Html.kt b/core/src/main/kotlin/Utilities/Html.kt
index ce3a1982..ce3a1982 100644
--- a/src/Utilities/Html.kt
+++ b/core/src/main/kotlin/Utilities/Html.kt
diff --git a/src/Utilities/Path.kt b/core/src/main/kotlin/Utilities/Path.kt
index 05838499..05838499 100644
--- a/src/Utilities/Path.kt
+++ b/core/src/main/kotlin/Utilities/Path.kt
diff --git a/src/Utilities/ServiceLocator.kt b/core/src/main/kotlin/Utilities/ServiceLocator.kt
index 7a5aff79..7a5aff79 100644
--- a/src/Utilities/ServiceLocator.kt
+++ b/core/src/main/kotlin/Utilities/ServiceLocator.kt
diff --git a/ant/src/dokka.kt b/core/src/main/kotlin/ant/dokka.kt
index d78980f8..d78980f8 100644
--- a/ant/src/dokka.kt
+++ b/core/src/main/kotlin/ant/dokka.kt
diff --git a/javadoc/src/main/kotlin/docbase.kt b/core/src/main/kotlin/javadoc/docbase.kt
index 1587db2a..a0caca94 100644
--- a/javadoc/src/main/kotlin/docbase.kt
+++ b/core/src/main/kotlin/javadoc/docbase.kt
@@ -380,7 +380,7 @@ open class ClassDocumentationNodeAdapter(module: ModuleNodeAdapter, val classNod
     : DocumentationNodeAdapter(module, classNode),
       Type by TypeAdapter(module, classNode),
       ProgramElementDoc by ProgramElementAdapter(module, classNode),
-      ClassDoc {
+        ClassDoc {
 
     override fun name(): String {
         val parent = classNode.owner
diff --git a/javadoc/src/main/kotlin/dokka-adapters.kt b/core/src/main/kotlin/javadoc/dokka-adapters.kt
index 00b73cae..23ee1702 100644
--- a/javadoc/src/main/kotlin/dokka-adapters.kt
+++ b/core/src/main/kotlin/javadoc/dokka-adapters.kt
@@ -16,6 +16,9 @@ class JavadocGenerator @Inject constructor (val options: DocumentationOptions, v
     override fun buildOutlines(nodes: Iterable<DocumentationNode>) {
         // no outline could be generated separately
     }
+
+    override fun buildSupportFiles() {
+    }
 }
 
 class JavadocFormatDescriptor : FormatDescriptor {
diff --git a/javadoc/src/main/kotlin/reporter.kt b/core/src/main/kotlin/javadoc/reporter.kt
index fc38368c..fc38368c 100644
--- a/javadoc/src/main/kotlin/reporter.kt
+++ b/core/src/main/kotlin/javadoc/reporter.kt
diff --git a/javadoc/src/main/kotlin/source-position.kt b/core/src/main/kotlin/javadoc/source-position.kt
index 0e4c6e3c..0e4c6e3c 100644
--- a/javadoc/src/main/kotlin/source-position.kt
+++ b/core/src/main/kotlin/javadoc/source-position.kt
diff --git a/javadoc/src/main/kotlin/tags.kt b/core/src/main/kotlin/javadoc/tags.kt
index 5872dbaa..5872dbaa 100644
--- a/javadoc/src/main/kotlin/tags.kt
+++ b/core/src/main/kotlin/javadoc/tags.kt
diff --git a/src/main.kt b/core/src/main/kotlin/main.kt
index 5a7514c4..22e82991 100644
--- a/src/main.kt
+++ b/core/src/main/kotlin/main.kt
@@ -121,9 +121,9 @@ object DokkaConsoleLogger: DokkaLogger {
 
     fun report() {
         if (warningCount > 0) {
-            println("Generation completed with $warningCount warnings")
+            println("generation completed with $warningCount warnings")
         } else {
-            println("Generation completed successfully")
+            println("generation completed successfully")
         }
     }
 }
diff --git a/resources/META-INF/MANIFEST.MF b/core/src/main/resources/META-INF/MANIFEST.MF
index 78fabddc..78fabddc 100644
--- a/resources/META-INF/MANIFEST.MF
+++ b/core/src/main/resources/META-INF/MANIFEST.MF
diff --git a/ant/src/dokka-antlib.xml b/core/src/main/resources/dokka-antlib.xml
index 9c3373d5..9c3373d5 100644
--- a/ant/src/dokka-antlib.xml
+++ b/core/src/main/resources/dokka-antlib.xml
diff --git a/resources/dokka/format/html-as-java.properties b/core/src/main/resources/dokka/format/html-as-java.properties
index f598f377..f598f377 100644
--- a/resources/dokka/format/html-as-java.properties
+++ b/core/src/main/resources/dokka/format/html-as-java.properties
diff --git a/resources/dokka/format/html.properties b/core/src/main/resources/dokka/format/html.properties
index 7881dfae..7881dfae 100644
--- a/resources/dokka/format/html.properties
+++ b/core/src/main/resources/dokka/format/html.properties
diff --git a/javadoc/src/main/resources/dokka/format/javadoc.properties b/core/src/main/resources/dokka/format/javadoc.properties
index a58317fc..a58317fc 100644
--- a/javadoc/src/main/resources/dokka/format/javadoc.properties
+++ b/core/src/main/resources/dokka/format/javadoc.properties
diff --git a/resources/dokka/format/jekyll.properties b/core/src/main/resources/dokka/format/jekyll.properties
index b11401a4..b11401a4 100644
--- a/resources/dokka/format/jekyll.properties
+++ b/core/src/main/resources/dokka/format/jekyll.properties
diff --git a/resources/dokka/format/kotlin-website.properties b/core/src/main/resources/dokka/format/kotlin-website.properties
index c13e7675..c13e7675 100644
--- a/resources/dokka/format/kotlin-website.properties
+++ b/core/src/main/resources/dokka/format/kotlin-website.properties
diff --git a/resources/dokka/format/markdown.properties b/core/src/main/resources/dokka/format/markdown.properties
index 6217a6df..6217a6df 100644
--- a/resources/dokka/format/markdown.properties
+++ b/core/src/main/resources/dokka/format/markdown.properties
diff --git a/resources/dokka/generator/default.properties b/core/src/main/resources/dokka/generator/default.properties
index a4a16200..a4a16200 100644
--- a/resources/dokka/generator/default.properties
+++ b/core/src/main/resources/dokka/generator/default.properties
diff --git a/javadoc/src/main/resources/dokka/generator/javadoc.properties b/core/src/main/resources/dokka/generator/javadoc.properties
index 4075704f..4075704f 100644
--- a/javadoc/src/main/resources/dokka/generator/javadoc.properties
+++ b/core/src/main/resources/dokka/generator/javadoc.properties
diff --git a/resources/dokka/language/java.properties b/core/src/main/resources/dokka/language/java.properties
index ab42f532..ab42f532 100644
--- a/resources/dokka/language/java.properties
+++ b/core/src/main/resources/dokka/language/java.properties
diff --git a/resources/dokka/language/kotlin.properties b/core/src/main/resources/dokka/language/kotlin.properties
index 16092007..16092007 100644
--- a/resources/dokka/language/kotlin.properties
+++ b/core/src/main/resources/dokka/language/kotlin.properties
diff --git a/resources/dokka/outline/yaml.properties b/core/src/main/resources/dokka/outline/yaml.properties
index 7268af37..7268af37 100644
--- a/resources/dokka/outline/yaml.properties
+++ b/core/src/main/resources/dokka/outline/yaml.properties
diff --git a/resources/dokka/styles/style.css b/core/src/main/resources/dokka/styles/style.css
index 09586237..09586237 100644
--- a/resources/dokka/styles/style.css
+++ b/core/src/main/resources/dokka/styles/style.css
diff --git a/javadoc/src/main/resources/format/javadoc.properties b/core/src/main/resources/format/javadoc.properties
index a58317fc..a58317fc 100644
--- a/javadoc/src/main/resources/format/javadoc.properties
+++ b/core/src/main/resources/format/javadoc.properties
diff --git a/test/src/TestAPI.kt b/core/src/test/kotlin/TestAPI.kt
index 6b21b7da..d7833e36 100644
--- a/test/src/TestAPI.kt
+++ b/core/src/test/kotlin/TestAPI.kt
@@ -199,6 +199,9 @@ class InMemoryLocation(override val path: String): Location {
 object InMemoryLocationService: LocationService {
     override fun location(qualifiedName: List<String>, hasMembers: Boolean) =
             InMemoryLocation(relativePathToNode(qualifiedName, hasMembers))
+
+    override val root: Location
+        get() = InMemoryLocation("")
 }
 
 val tempLocation = InMemoryLocation("")
diff --git a/test/src/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt
index 90291bff..593dbfe6 100644
--- a/test/src/format/HtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/HtmlFormatTest.kt
@@ -12,144 +12,144 @@ public class HtmlFormatTest {
     private val htmlService = HtmlFormatService(InMemoryLocationService, KotlinLanguageService(), HtmlTemplateService.default())
 
     @Test fun classWithCompanionObject() {
-        verifyOutput("test/data/format/classWithCompanionObject.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/classWithCompanionObject.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun htmlEscaping() {
-        verifyOutput("test/data/format/htmlEscaping.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/htmlEscaping.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun overloads() {
-        verifyOutput("test/data/format/overloads.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/overloads.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members)
         }
     }
 
     @Test fun overloadsWithDescription() {
-        verifyOutput("test/data/format/overloadsWithDescription.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/overloadsWithDescription.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun overloadsWithDifferentDescriptions() {
-        verifyOutput("test/data/format/overloadsWithDifferentDescriptions.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/overloadsWithDifferentDescriptions.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun deprecated() {
-        verifyOutput("test/data/format/deprecated.kt", ".package.html") { model, output ->
+        verifyOutput("testdata/format/deprecated.kt", ".package.html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members)
         }
-        verifyOutput("test/data/format/deprecated.kt", ".class.html") { model, output ->
+        verifyOutput("testdata/format/deprecated.kt", ".class.html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun brokenLink() {
-        verifyOutput("test/data/format/brokenLink.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/brokenLink.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun codeSpan() {
-        verifyOutput("test/data/format/codeSpan.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/codeSpan.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun parenthesis() {
-        verifyOutput("test/data/format/parenthesis.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/parenthesis.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun bracket() {
-        verifyOutput("test/data/format/bracket.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/bracket.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun see() {
-        verifyOutput("test/data/format/see.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/see.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun tripleBackticks() {
-        verifyOutput("test/data/format/tripleBackticks.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/tripleBackticks.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun typeLink() {
-        verifyOutput("test/data/format/typeLink.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/typeLink.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar"} )
         }
     }
 
     @Test fun parameterAnchor() {
-        verifyOutput("test/data/format/parameterAnchor.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/parameterAnchor.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaSupertypeLink() {
-        verifyJavaOutput("test/data/format/javaSupertype.java", ".html") { model, output ->
+        verifyJavaOutput("testdata/format/javaSupertype.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.single { it.name == "C"}.members.filter { it.name == "Bar"} )
         }
     }
 
     @Test fun javaLinkTag() {
-        verifyJavaOutput("test/data/format/javaLinkTag.java", ".html") { model, output ->
+        verifyJavaOutput("testdata/format/javaLinkTag.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaLinkTagWithLabel() {
-        verifyJavaOutput("test/data/format/javaLinkTagWithLabel.java", ".html") { model, output ->
+        verifyJavaOutput("testdata/format/javaLinkTagWithLabel.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaSeeTag() {
-        verifyJavaOutput("test/data/format/javaSeeTag.java", ".html") { model, output ->
+        verifyJavaOutput("testdata/format/javaSeeTag.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaDeprecated() {
-        verifyJavaOutput("test/data/format/javaDeprecated.java", ".html") { model, output ->
+        verifyJavaOutput("testdata/format/javaDeprecated.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.single { it.name == "Foo" }.members.filter { it.name == "foo" })
         }
     }
 
     @Test fun crossLanguageKotlinExtendsJava() {
-        verifyOutput(arrayOf(KotlinSourceRoot("test/data/format/crossLanguage/kotlinExtendsJava/Bar.kt"),
-                            JavaSourceRoot(File("test/data/format/crossLanguage/kotlinExtendsJava"), null)),
+        verifyOutput(arrayOf(KotlinSourceRoot("testdata/format/crossLanguage/kotlinExtendsJava/Bar.kt"),
+                            JavaSourceRoot(File("testdata/format/crossLanguage/kotlinExtendsJava"), null)),
                 ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
 
     @Test fun orderedList() {
-        verifyOutput("test/data/format/orderedList.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/orderedList.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
 
     @Test fun linkWithLabel() {
-        verifyOutput("test/data/format/linkWithLabel.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/linkWithLabel.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
 
     @Test fun entity() {
-        verifyOutput("test/data/format/entity.kt", ".html") { model, output ->
+        verifyOutput("testdata/format/entity.kt", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
diff --git a/test/src/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 1a09ae60..e2339707 100644
--- a/test/src/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -8,49 +8,49 @@ public class MarkdownFormatTest {
     private val markdownService = MarkdownFormatService(InMemoryLocationService, KotlinLanguageService())
 
     @Test fun emptyDescription() {
-        verifyOutput("test/data/format/emptyDescription.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/emptyDescription.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun classWithCompanionObject() {
-        verifyOutput("test/data/format/classWithCompanionObject.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/classWithCompanionObject.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun annotations() {
-        verifyOutput("test/data/format/annotations.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/annotations.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun annotationClass() {
-        verifyOutput("test/data/format/annotationClass.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/annotationClass.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun annotationParams() {
-        verifyOutput("test/data/format/annotationParams.kt", ".md", withKotlinRuntime = true) { model, output ->
+        verifyOutput("testdata/format/annotationParams.kt", ".md", withKotlinRuntime = true) { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun extensions() {
-        verifyOutput("test/data/format/extensions.kt", ".package.md") { model, output ->
+        verifyOutput("testdata/format/extensions.kt", ".package.md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members)
         }
-        verifyOutput("test/data/format/extensions.kt", ".class.md") { model, output ->
+        verifyOutput("testdata/format/extensions.kt", ".class.md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun enumClass() {
-        verifyOutput("test/data/format/enumClass.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/enumClass.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
-        verifyOutput("test/data/format/enumClass.kt", ".value.md") { model, output ->
+        verifyOutput("testdata/format/enumClass.kt", ".value.md") { model, output ->
             val enumClassNode = model.members.single().members[0]
             markdownService.appendNodes(tempLocation, output,
                     enumClassNode.members.filter { it.name == "LOCAL_CONTINUE_AND_BREAK" })
@@ -58,13 +58,13 @@ public class MarkdownFormatTest {
     }
 
     @Test fun varargsFunction() {
-        verifyOutput("test/data/format/varargsFunction.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/varargsFunction.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun overridingFunction() {
-        verifyOutput("test/data/format/overridingFunction.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/overridingFunction.kt", ".md") { model, output ->
             val classMembers = model.members.single().members.first { it.name == "D" }.members
             markdownService.appendNodes(tempLocation, output, classMembers.filter { it.name == "f" })
         }
@@ -72,146 +72,146 @@ public class MarkdownFormatTest {
     }
 
     @Test fun propertyVar() {
-        verifyOutput("test/data/format/propertyVar.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/propertyVar.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun functionWithDefaultParameter() {
-        verifyOutput("test/data/format/functionWithDefaultParameter.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/functionWithDefaultParameter.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun accessor() {
-        verifyOutput("test/data/format/accessor.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/accessor.kt", ".md") { model, output ->
             val propertyNode = model.members.single().members.first { it.name == "C" }.members.filter { it.name == "x" }
             markdownService.appendNodes(tempLocation, output, propertyNode)
         }
     }
 
     @Test fun paramTag() {
-        verifyOutput("test/data/format/paramTag.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/paramTag.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun throwsTag() {
-        verifyOutput("test/data/format/throwsTag.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/throwsTag.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun typeParameterBounds() {
-        verifyOutput("test/data/format/typeParameterBounds.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/typeParameterBounds.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun typeParameterVariance() {
-        verifyOutput("test/data/format/typeParameterVariance.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/typeParameterVariance.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun typeProjectionVariance() {
-        verifyOutput("test/data/format/typeProjectionVariance.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/typeProjectionVariance.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javadocHtml() {
-        verifyJavaOutput("test/data/format/javadocHtml.java", ".md") { model, output ->
+        verifyJavaOutput("testdata/format/javadocHtml.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaCodeLiteralTags() {
-        verifyJavaOutput("test/data/format/javaCodeLiteralTags.java", ".md") { model, output ->
+        verifyJavaOutput("testdata/format/javaCodeLiteralTags.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaCodeInParam() {
-        verifyJavaOutput("test/data/format/javaCodeInParam.java", ".md") { model, output ->
+        verifyJavaOutput("testdata/format/javaCodeInParam.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaSpaceInAuthor() {
-        verifyJavaOutput("test/data/format/javaSpaceInAuthor.java", ".md") { model, output ->
+        verifyJavaOutput("testdata/format/javaSpaceInAuthor.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun nullability() {
-        verifyOutput("test/data/format/nullability.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/nullability.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun operatorOverloading() {
-        verifyOutput("test/data/format/operatorOverloading.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/operatorOverloading.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.single { it.name == "C" }.members.filter { it.name == "plus" })
         }
     }
 
     @Test fun javadocOrderedList() {
-        verifyJavaOutput("test/data/format/javadocOrderedList.java", ".md") { model, output ->
+        verifyJavaOutput("testdata/format/javadocOrderedList.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
 
     @Test fun companionObjectExtension() {
-        verifyOutput("test/data/format/companionObjectExtension.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/companionObjectExtension.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Foo" })
         }
     }
 
     @Test fun starProjection() {
-        verifyOutput("test/data/format/starProjection.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/starProjection.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun extensionFunctionParameter() {
-        verifyOutput("test/data/format/extensionFunctionParameter.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/extensionFunctionParameter.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun summarizeSignatures() {
-        verifyOutput("test/data/format/summarizeSignatures.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/summarizeSignatures.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members)
         }
     }
 
     @Test fun summarizeSignaturesProperty() {
-        verifyOutput("test/data/format/summarizeSignaturesProperty.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/summarizeSignaturesProperty.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members)
         }
     }
 
     @Test fun reifiedTypeParameter() {
-        verifyOutput("test/data/format/reifiedTypeParameter.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/reifiedTypeParameter.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun annotatedTypeParameter() {
-        verifyOutput("test/data/format/annotatedTypeParameter.kt", ".md", withKotlinRuntime = true) { model, output ->
+        verifyOutput("testdata/format/annotatedTypeParameter.kt", ".md", withKotlinRuntime = true) { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun inheritedMembers() {
-        verifyOutput("test/data/format/inheritedMembers.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/inheritedMembers.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
 
     @Test fun inheritedExtensions() {
-        verifyOutput("test/data/format/inheritedExtensions.kt", ".md") { model, output ->
+        verifyOutput("testdata/format/inheritedExtensions.kt", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
diff --git a/test/src/format/PackageDocsTest.kt b/core/src/test/kotlin/format/PackageDocsTest.kt
index 57a08563..4d7852da 100644
--- a/test/src/format/PackageDocsTest.kt
+++ b/core/src/test/kotlin/format/PackageDocsTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.assertEquals
 public class PackageDocsTest {
     @Test fun verifyParse() {
         val docs = PackageDocs(null, DokkaConsoleLogger)
-        docs.parse("test/data/packagedocs/stdlib.md", null)
+        docs.parse("testdata/packagedocs/stdlib.md", null)
         val packageContent = docs.packageContent["kotlin"]!!
         val block = (packageContent.children.single() as ContentBlock).children.first() as ContentText
         assertEquals("Core functions and types", block.text)
diff --git a/javadoc/src/test/kotlin/JavadocTest.kt b/core/src/test/kotlin/javadoc/JavadocTest.kt
index 1ac7069b..4f0049ac 100644
--- a/javadoc/src/test/kotlin/JavadocTest.kt
+++ b/core/src/test/kotlin/javadoc/JavadocTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.assertTrue
 
 class JavadocTest {
     @Test fun testTypes() {
-        verifyModel("javadoc/src/test/data/types.kt", format = "javadoc", withJdk = true) { model ->
+        verifyModel("testdata/javadoc/types.kt", format = "javadoc", withJdk = true) { model ->
             val doc = ModuleNodeAdapter(model, StandardReporter(DokkaConsoleLogger), "")
             val classDoc = doc.classNamed("foo.TypesKt")!!
             val method = classDoc.methods().find { it.name() == "foo" }!!
@@ -27,7 +27,7 @@ class JavadocTest {
     }
 
     @Test fun testObject() {
-        verifyModel("javadoc/src/test/data/obj.kt", format = "javadoc") { model ->
+        verifyModel("testdata/javadoc/obj.kt", format = "javadoc") { model ->
             val doc = ModuleNodeAdapter(model, StandardReporter(DokkaConsoleLogger), "")
 
             val classDoc = doc.classNamed("foo.O")
diff --git a/test/src/markdown/ParserTest.kt b/core/src/test/kotlin/markdown/ParserTest.kt
index 5a7adf05..5a7adf05 100644
--- a/test/src/markdown/ParserTest.kt
+++ b/core/src/test/kotlin/markdown/ParserTest.kt
diff --git a/test/src/model/ClassTest.kt b/core/src/test/kotlin/model/ClassTest.kt
index ce4b4683..981791c4 100644
--- a/test/src/model/ClassTest.kt
+++ b/core/src/test/kotlin/model/ClassTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 
 public class ClassTest {
     @Test fun emptyClass() {
-        verifyModel("test/data/classes/emptyClass.kt") { model ->
+        verifyModel("testdata/classes/emptyClass.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Class, kind)
                 assertEquals("Klass", name)
@@ -21,7 +21,7 @@ public class ClassTest {
     }
 
     @Test fun emptyObject() {
-        verifyModel("test/data/classes/emptyObject.kt") { model ->
+        verifyModel("testdata/classes/emptyObject.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Object, kind)
                 assertEquals("Obj", name)
@@ -33,7 +33,7 @@ public class ClassTest {
     }
 
     @Test fun classWithConstructor() {
-        verifyModel("test/data/classes/classWithConstructor.kt") { model ->
+        verifyModel("testdata/classes/classWithConstructor.kt") { model ->
             with (model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Class, kind)
                 assertEquals("Klass", name)
@@ -63,7 +63,7 @@ public class ClassTest {
     }
 
     @Test fun classWithFunction() {
-        verifyModel("test/data/classes/classWithFunction.kt") { model ->
+        verifyModel("testdata/classes/classWithFunction.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Class, kind)
                 assertEquals("Klass", name)
@@ -93,7 +93,7 @@ public class ClassTest {
     }
 
     @Test fun classWithProperty() {
-        verifyModel("test/data/classes/classWithProperty.kt") { model ->
+        verifyModel("testdata/classes/classWithProperty.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Class, kind)
                 assertEquals("Klass", name)
@@ -123,7 +123,7 @@ public class ClassTest {
     }
 
     @Test fun classWithCompanionObject() {
-        verifyModel("test/data/classes/classWithCompanionObject.kt") { model ->
+        verifyModel("testdata/classes/classWithCompanionObject.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(DocumentationNode.Kind.Class, kind)
                 assertEquals("Klass", name)
@@ -152,7 +152,7 @@ public class ClassTest {
     }
 
     @Test fun annotatedClass() {
-        verifyPackageMember("test/data/classes/annotatedClass.kt", withKotlinRuntime = true) { cls ->
+        verifyPackageMember("testdata/classes/annotatedClass.kt", withKotlinRuntime = true) { cls ->
             assertEquals(1, cls.annotations.count())
             with(cls.annotations[0]) {
                 assertEquals("Strictfp", name)
@@ -163,21 +163,21 @@ public class ClassTest {
     }
 
     @Test fun dataClass() {
-        verifyPackageMember("test/data/classes/dataClass.kt") { cls ->
+        verifyPackageMember("testdata/classes/dataClass.kt") { cls ->
             val modifiers = cls.details(DocumentationNode.Kind.Modifier).map { it.name }
             assertTrue("data" in modifiers)
         }
     }
 
     @Test fun sealedClass() {
-        verifyPackageMember("test/data/classes/sealedClass.kt") { cls ->
+        verifyPackageMember("testdata/classes/sealedClass.kt") { cls ->
             val modifiers = cls.details(DocumentationNode.Kind.Modifier).map { it.name }
             assertEquals(1, modifiers.count { it == "sealed" })
         }
     }
 
     @Test fun annotatedClassWithAnnotationParameters() {
-        verifyModel("test/data/classes/annotatedClassWithAnnotationParameters.kt") { model ->
+        verifyModel("testdata/classes/annotatedClassWithAnnotationParameters.kt") { model ->
             with(model.members.single().members.single()) {
                 with(deprecation!!) {
                     assertEquals("Deprecated", name)
@@ -198,7 +198,7 @@ public class ClassTest {
     }
 
     @Test fun javaAnnotationClass() {
-        verifyModel("test/data/classes/javaAnnotationClass.kt", withJdk = true) { model ->
+        verifyModel("testdata/classes/javaAnnotationClass.kt", withJdk = true) { model ->
             with(model.members.single().members.single()) {
                 assertEquals(1, annotations.count())
                 with(annotations[0]) {
@@ -219,7 +219,7 @@ public class ClassTest {
     }
 
     @Test fun notOpenClass() {
-        verifyModel("test/data/classes/notOpenClass.kt") { model ->
+        verifyModel("testdata/classes/notOpenClass.kt") { model ->
             with(model.members.single().members.first { it.name == "D"}.members.first { it.name == "f" }) {
                 val modifiers = details(DocumentationNode.Kind.Modifier)
                 assertEquals(2, modifiers.size)
@@ -232,7 +232,7 @@ public class ClassTest {
     }
 
     @Test fun indirectOverride() {
-        verifyModel("test/data/classes/indirectOverride.kt") { model ->
+        verifyModel("testdata/classes/indirectOverride.kt") { model ->
             with(model.members.single().members.first { it.name == "E"}.members.first { it.name == "foo" }) {
                 val modifiers = details(DocumentationNode.Kind.Modifier)
                 assertEquals(2, modifiers.size)
@@ -245,7 +245,7 @@ public class ClassTest {
     }
 
     @Test fun innerClass() {
-        verifyPackageMember("test/data/classes/innerClass.kt") { cls ->
+        verifyPackageMember("testdata/classes/innerClass.kt") { cls ->
             val innerClass = cls.members.single { it.name == "D" }
             val modifiers = innerClass.details(DocumentationNode.Kind.Modifier)
             assertEquals(3, modifiers.size)
@@ -254,7 +254,7 @@ public class ClassTest {
     }
 
     @Test fun companionObjectExtension() {
-        verifyModel("test/data/classes/companionObjectExtension.kt") { model ->
+        verifyModel("testdata/classes/companionObjectExtension.kt") { model ->
             val pkg = model.members.single()
             val cls = pkg.members.single { it.name == "Foo" }
             val extensions = cls.extensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectProperty }
@@ -263,7 +263,7 @@ public class ClassTest {
     }
 
     @Test fun secondaryConstructor() {
-        verifyPackageMember("test/data/classes/secondaryConstructor.kt") { cls ->
+        verifyPackageMember("testdata/classes/secondaryConstructor.kt") { cls ->
             val constructors = cls.members(DocumentationNode.Kind.Constructor)
             assertEquals(2, constructors.size)
             with (constructors.first { it.details(DocumentationNode.Kind.Parameter).size == 1}) {
diff --git a/test/src/model/CommentTest.kt b/core/src/test/kotlin/model/CommentTest.kt
index c4d867fb..f3792610 100644
--- a/test/src/model/CommentTest.kt
+++ b/core/src/test/kotlin/model/CommentTest.kt
@@ -6,7 +6,7 @@ import org.jetbrains.dokka.*
 
 public class CommentTest {
     @Test fun emptyDoc() {
-        verifyModel("test/data/comments/emptyDoc.kt") { model ->
+        verifyModel("testdata/comments/emptyDoc.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(Content.Empty, content)
             }
@@ -14,7 +14,7 @@ public class CommentTest {
     }
 
     @Test fun emptyDocButComment() {
-        verifyModel("test/data/comments/emptyDocButComment.kt") { model ->
+        verifyModel("testdata/comments/emptyDocButComment.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals(Content.Empty, content)
             }
@@ -22,7 +22,7 @@ public class CommentTest {
     }
 
     @Test fun multilineDoc() {
-        verifyModel("test/data/comments/multilineDoc.kt") { model ->
+        verifyModel("testdata/comments/multilineDoc.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("doc1", content.summary.toTestString())
                 assertEquals("doc2\ndoc3", content.description.toTestString())
@@ -31,7 +31,7 @@ public class CommentTest {
     }
 
     @Test fun multilineDocWithComment() {
-        verifyModel("test/data/comments/multilineDocWithComment.kt") { model ->
+        verifyModel("testdata/comments/multilineDocWithComment.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("doc1", content.summary.toTestString())
                 assertEquals("doc2\ndoc3", content.description.toTestString())
@@ -40,7 +40,7 @@ public class CommentTest {
     }
 
     @Test fun oneLineDoc() {
-        verifyModel("test/data/comments/oneLineDoc.kt") { model ->
+        verifyModel("testdata/comments/oneLineDoc.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("doc", content.summary.toTestString())
             }
@@ -48,7 +48,7 @@ public class CommentTest {
     }
 
     @Test fun oneLineDocWithComment() {
-        verifyModel("test/data/comments/oneLineDocWithComment.kt") { model ->
+        verifyModel("testdata/comments/oneLineDocWithComment.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("doc", content.summary.toTestString())
             }
@@ -56,7 +56,7 @@ public class CommentTest {
     }
 
     @Test fun oneLineDocWithEmptyLine() {
-        verifyModel("test/data/comments/oneLineDocWithEmptyLine.kt") { model ->
+        verifyModel("testdata/comments/oneLineDocWithEmptyLine.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("doc", content.summary.toTestString())
             }
@@ -64,7 +64,7 @@ public class CommentTest {
     }
 
     @Test fun emptySection() {
-        verifyModel("test/data/comments/emptySection.kt") { model ->
+        verifyModel("testdata/comments/emptySection.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Summary", content.summary.toTestString())
                 assertEquals(1, content.sections.count())
@@ -77,7 +77,7 @@ public class CommentTest {
     }
 
     @Test fun section1() {
-        verifyModel("test/data/comments/section1.kt") { model ->
+        verifyModel("testdata/comments/section1.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Summary", content.summary.toTestString())
                 assertEquals(1, content.sections.count())
@@ -90,7 +90,7 @@ public class CommentTest {
     }
 
     @Test fun section2() {
-        verifyModel("test/data/comments/section2.kt") { model ->
+        verifyModel("testdata/comments/section2.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Summary", content.summary.toTestString())
                 assertEquals(2, content.sections.count())
@@ -107,7 +107,7 @@ public class CommentTest {
     }
 
     @Test fun multilineSection() {
-        verifyModel("test/data/comments/multilineSection.kt") { model ->
+        verifyModel("testdata/comments/multilineSection.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Summary", content.summary.toTestString())
                 assertEquals(1, content.sections.count())
@@ -121,7 +121,7 @@ line two""", toTestString())
     }
 
     @Test fun directive() {
-        verifyModel("test/data/comments/directive.kt") { model ->
+        verifyModel("testdata/comments/directive.kt") { model ->
             with(model.members.single().members.first()) {
                 assertEquals("Summary", content.summary.toTestString())
                 with (content.description) {
diff --git a/test/src/model/FunctionTest.kt b/core/src/test/kotlin/model/FunctionTest.kt
index 8d1cf609..83fd8223 100644
--- a/test/src/model/FunctionTest.kt
+++ b/core/src/test/kotlin/model/FunctionTest.kt
@@ -8,7 +8,7 @@ import kotlin.test.assertTrue
 
 public class FunctionTest {
     @Test fun function() {
-        verifyModel("test/data/functions/function.kt") { model ->
+        verifyModel("testdata/functions/function.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("fn", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
@@ -21,7 +21,7 @@ public class FunctionTest {
     }
 
     @Test fun functionWithReceiver() {
-        verifyModel("test/data/functions/functionWithReceiver.kt") { model ->
+        verifyModel("testdata/functions/functionWithReceiver.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("kotlin.String", name)
                 assertEquals(DocumentationNode.Kind.ExternalClass, kind)
@@ -53,7 +53,7 @@ public class FunctionTest {
     }
 
     @Test fun genericFunction() {
-        verifyModel("test/data/functions/genericFunction.kt") { model ->
+        verifyModel("testdata/functions/genericFunction.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("generic", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
@@ -77,7 +77,7 @@ public class FunctionTest {
         }
     }
     @Test fun genericFunctionWithConstraints() {
-        verifyModel("test/data/functions/genericFunctionWithConstraints.kt") { model ->
+        verifyModel("testdata/functions/genericFunctionWithConstraints.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("generic", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
@@ -116,7 +116,7 @@ public class FunctionTest {
     }
 
     @Test fun functionWithParams() {
-        verifyModel("test/data/functions/functionWithParams.kt") { model ->
+        verifyModel("testdata/functions/functionWithParams.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("function", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
@@ -142,7 +142,7 @@ Documentation""", content.description.toTestString())
     }
 
     @Test fun annotatedFunction() {
-        verifyPackageMember("test/data/functions/annotatedFunction.kt", withKotlinRuntime = true) { func ->
+        verifyPackageMember("testdata/functions/annotatedFunction.kt", withKotlinRuntime = true) { func ->
             assertEquals(1, func.annotations.count())
             with(func.annotations[0]) {
                 assertEquals("Strictfp", name)
@@ -153,20 +153,20 @@ Documentation""", content.description.toTestString())
     }
 
     @Test fun functionWithNotDocumentedAnnotation() {
-        verifyPackageMember("test/data/functions/functionWithNotDocumentedAnnotation.kt") { func ->
+        verifyPackageMember("testdata/functions/functionWithNotDocumentedAnnotation.kt") { func ->
             assertEquals(0, func.annotations.count())
         }
     }
 
     @Test fun inlineFunction() {
-        verifyPackageMember("test/data/functions/inlineFunction.kt") { func ->
+        verifyPackageMember("testdata/functions/inlineFunction.kt") { func ->
             val modifiers = func.details(DocumentationNode.Kind.Modifier).map { it.name }
             assertTrue("inline" in modifiers)
         }
     }
 
     @Test fun functionWithAnnotatedParam() {
-        verifyModel("test/data/functions/functionWithAnnotatedParam.kt") { model ->
+        verifyModel("testdata/functions/functionWithAnnotatedParam.kt") { model ->
             with(model.members.single().members.single { it.name == "function"} ) {
                 with(details.elementAt(2)) {
                     assertEquals(1, annotations.count())
@@ -181,7 +181,7 @@ Documentation""", content.description.toTestString())
     }
 
     @Test fun functionWithNoinlineParam() {
-        verifyPackageMember("test/data/functions/functionWithNoinlineParam.kt") { func ->
+        verifyPackageMember("testdata/functions/functionWithNoinlineParam.kt") { func ->
             with(func.details.elementAt(2)) {
                 val modifiers = details(DocumentationNode.Kind.Modifier).map { it.name }
                 assertTrue("noinline" in modifiers)
@@ -190,7 +190,7 @@ Documentation""", content.description.toTestString())
     }
 
     @Test fun annotatedFunctionWithAnnotationParameters() {
-        verifyModel("test/data/functions/annotatedFunctionWithAnnotationParameters.kt") { model ->
+        verifyModel("testdata/functions/annotatedFunctionWithAnnotationParameters.kt") { model ->
             with(model.members.single().members.single { it.name == "f"}) {
                 assertEquals(1, annotations.count())
                 with(annotations[0]) {
@@ -212,7 +212,7 @@ Documentation""", content.description.toTestString())
     }
 
     @Test fun functionWithDefaultParameter() {
-        verifyModel("test/data/functions/functionWithDefaultParameter.kt") { model ->
+        verifyModel("testdata/functions/functionWithDefaultParameter.kt") { model ->
             with(model.members.single().members.single()) {
                 with(details.elementAt(2)) {
                     val value = details(DocumentationNode.Kind.Value)
diff --git a/test/src/model/JavaTest.kt b/core/src/test/kotlin/model/JavaTest.kt
index 0633a5cc..903260d3 100644
--- a/test/src/model/JavaTest.kt
+++ b/core/src/test/kotlin/model/JavaTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 
 public class JavaTest {
     @Test fun function() {
-        verifyJavaPackageMember("test/data/java/member.java") { cls ->
+        verifyJavaPackageMember("testdata/java/member.java") { cls ->
             assertEquals("Test", cls.name)
             assertEquals(DocumentationNode.Kind.Class, cls.kind)
             with(cls.members(DocumentationNode.Kind.Function).single()) {
@@ -46,7 +46,7 @@ public class JavaTest {
     }
 
     @Test fun memberWithModifiers() {
-        verifyJavaPackageMember("test/data/java/memberWithModifiers.java") { cls ->
+        verifyJavaPackageMember("testdata/java/memberWithModifiers.java") { cls ->
             val modifiers = cls.details(DocumentationNode.Kind.Modifier).map { it.name }
             assertTrue("abstract" in modifiers)
             with(cls.members.single { it.name == "fn" }) {
@@ -59,7 +59,7 @@ public class JavaTest {
     }
 
     @Test fun superClass() {
-        verifyJavaPackageMember("test/data/java/superClass.java") { cls ->
+        verifyJavaPackageMember("testdata/java/superClass.java") { cls ->
             val superTypes = cls.details(DocumentationNode.Kind.Supertype)
             assertEquals(2, superTypes.size)
             assertEquals("Exception", superTypes[0].name)
@@ -68,7 +68,7 @@ public class JavaTest {
     }
 
     @Test fun arrayType() {
-        verifyJavaPackageMember("test/data/java/arrayType.java") { cls ->
+        verifyJavaPackageMember("testdata/java/arrayType.java") { cls ->
             with(cls.members(DocumentationNode.Kind.Function).single()) {
                 val type = detail(DocumentationNode.Kind.Type)
                 assertEquals("Array", type.name)
@@ -82,7 +82,7 @@ public class JavaTest {
     }
 
     @Test fun typeParameter() {
-        verifyJavaPackageMember("test/data/java/typeParameter.java") { cls ->
+        verifyJavaPackageMember("testdata/java/typeParameter.java") { cls ->
             val typeParameters = cls.details(DocumentationNode.Kind.TypeParameter)
             with(typeParameters.single()) {
                 assertEquals("T", name)
@@ -101,7 +101,7 @@ public class JavaTest {
     }
 
     @Test fun constructors() {
-        verifyJavaPackageMember("test/data/java/constructors.java") { cls ->
+        verifyJavaPackageMember("testdata/java/constructors.java") { cls ->
             val constructors = cls.members(DocumentationNode.Kind.Constructor)
             assertEquals(2, constructors.size)
             with(constructors[0]) {
@@ -111,14 +111,14 @@ public class JavaTest {
     }
 
     @Test fun innerClass() {
-        verifyJavaPackageMember("test/data/java/innerClass.java") { cls ->
+        verifyJavaPackageMember("testdata/java/innerClass.java") { cls ->
             val innerClass = cls.members(DocumentationNode.Kind.Class).single()
             assertEquals("D", innerClass.name)
         }
     }
 
     @Test fun varargs() {
-        verifyJavaPackageMember("test/data/java/varargs.java") { cls ->
+        verifyJavaPackageMember("testdata/java/varargs.java") { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             val param = fn.detail(DocumentationNode.Kind.Parameter)
             assertEquals("vararg", param.details(DocumentationNode.Kind.Modifier).first().name)
@@ -129,7 +129,7 @@ public class JavaTest {
     }
 
     @Test fun fields() {
-        verifyJavaPackageMember("test/data/java/field.java") { cls ->
+        verifyJavaPackageMember("testdata/java/field.java") { cls ->
             val i = cls.members(DocumentationNode.Kind.Property).single { it.name == "i" }
             assertEquals("Int", i.detail(DocumentationNode.Kind.Type).name)
             assertTrue("var" in i.details(DocumentationNode.Kind.Modifier).map { it.name })
@@ -142,14 +142,14 @@ public class JavaTest {
     }
 
     @Test fun staticMethod() {
-        verifyJavaPackageMember("test/data/java/staticMethod.java") { cls ->
+        verifyJavaPackageMember("testdata/java/staticMethod.java") { cls ->
             val m = cls.members(DocumentationNode.Kind.Function).single { it.name == "foo" }
             assertTrue("static" in m.details(DocumentationNode.Kind.Modifier).map { it.name })
         }
     }
 
     @Test fun annotatedAnnotation() {
-        verifyJavaPackageMember("test/data/java/annotatedAnnotation.java") { cls ->
+        verifyJavaPackageMember("testdata/java/annotatedAnnotation.java") { cls ->
             assertEquals(1, cls.annotations.size)
             with(cls.annotations[0]) {
                 assertEquals(1, details.count())
@@ -166,21 +166,21 @@ public class JavaTest {
     }
 
     @Test fun deprecation() {
-        verifyJavaPackageMember("test/data/java/deprecation.java") { cls ->
+        verifyJavaPackageMember("testdata/java/deprecation.java") { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             assertEquals("This should no longer be used", fn.deprecation!!.content.toTestString())
         }
     }
 
     @Test fun javaLangObject() {
-        verifyJavaPackageMember("test/data/java/javaLangObject.java") { cls ->
+        verifyJavaPackageMember("testdata/java/javaLangObject.java") { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             assertEquals("Any", fn.detail(DocumentationNode.Kind.Type).name)
         }
     }
 
     @Test fun enumValues() {
-        verifyJavaPackageMember("test/data/java/enumValues.java") { cls ->
+        verifyJavaPackageMember("testdata/java/enumValues.java") { cls ->
             val superTypes = cls.details(DocumentationNode.Kind.Supertype)
             assertEquals(0, superTypes.size)
             assertEquals(1, cls.members(DocumentationNode.Kind.EnumItem).size)
@@ -188,7 +188,7 @@ public class JavaTest {
     }
 
     @Test fun inheritorLinks() {
-        verifyJavaPackageMember("test/data/java/inheritorLinks.java") { cls ->
+        verifyJavaPackageMember("testdata/java/inheritorLinks.java") { cls ->
             val fooClass = cls.members.single { it.name == "Foo" }
             val inheritors = fooClass.references(DocumentationReference.Kind.Inheritor)
             assertEquals(1, inheritors.size)
diff --git a/test/src/model/KotlinAsJavaTest.kt b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
index 18a1cfef..b439d399 100644
--- a/test/src/model/KotlinAsJavaTest.kt
+++ b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
@@ -7,7 +7,7 @@ import kotlin.test.assertEquals
 
 class KotlinAsJavaTest {
     @Test fun function() {
-        verifyModelAsJava("test/data/functions/function.kt") { model ->
+        verifyModelAsJava("testdata/functions/function.kt") { model ->
             val pkg = model.members.single()
 
             val facadeClass = pkg.members.single { it.name == "FunctionKt" }
@@ -20,7 +20,7 @@ class KotlinAsJavaTest {
     }
 
     @Test fun propertyWithComment() {
-        verifyModelAsJava("test/data/comments/oneLineDoc.kt") { model ->
+        verifyModelAsJava("testdata/comments/oneLineDoc.kt") { model ->
             val facadeClass = model.members.single().members.single { it.name == "OneLineDocKt" }
             val getter = facadeClass.members.single { it.name == "getProperty" }
             assertEquals(DocumentationNode.Kind.Function, getter.kind)
diff --git a/test/src/model/LinkTest.kt b/core/src/test/kotlin/model/LinkTest.kt
index a8004367..c30e1c10 100644
--- a/test/src/model/LinkTest.kt
+++ b/core/src/test/kotlin/model/LinkTest.kt
@@ -6,7 +6,7 @@ import org.jetbrains.dokka.*
 
 public class LinkTest {
     @Test fun linkToSelf() {
-        verifyModel("test/data/links/linkToSelf.kt") { model ->
+        verifyModel("testdata/links/linkToSelf.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Foo", name)
                 assertEquals(DocumentationNode.Kind.Class, kind)
@@ -16,7 +16,7 @@ public class LinkTest {
     }
 
     @Test fun linkToMember() {
-        verifyModel("test/data/links/linkToMember.kt") { model ->
+        verifyModel("testdata/links/linkToMember.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Foo", name)
                 assertEquals(DocumentationNode.Kind.Class, kind)
@@ -26,7 +26,7 @@ public class LinkTest {
     }
 
     @Test fun linkToQualifiedMember() {
-        verifyModel("test/data/links/linkToQualifiedMember.kt") { model ->
+        verifyModel("testdata/links/linkToQualifiedMember.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Foo", name)
                 assertEquals(DocumentationNode.Kind.Class, kind)
@@ -36,7 +36,7 @@ public class LinkTest {
     }
 
     @Test fun linkToParam() {
-        verifyModel("test/data/links/linkToParam.kt") { model ->
+        verifyModel("testdata/links/linkToParam.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Foo", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
diff --git a/test/src/model/PackageTest.kt b/core/src/test/kotlin/model/PackageTest.kt
index 52324f1d..aa5a059a 100644
--- a/test/src/model/PackageTest.kt
+++ b/core/src/test/kotlin/model/PackageTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 
 public class PackageTest {
     @Test fun rootPackage() {
-        verifyModel("test/data/packages/rootPackage.kt") { model ->
+        verifyModel("testdata/packages/rootPackage.kt") { model ->
             with(model.members.single()) {
                 assertEquals(DocumentationNode.Kind.Package, kind)
                 assertEquals("", name)
@@ -22,7 +22,7 @@ public class PackageTest {
     }
 
     @Test fun simpleNamePackage() {
-        verifyModel("test/data/packages/simpleNamePackage.kt") { model ->
+        verifyModel("testdata/packages/simpleNamePackage.kt") { model ->
             with(model.members.single()) {
                 assertEquals(DocumentationNode.Kind.Package, kind)
                 assertEquals("simple", name)
@@ -35,7 +35,7 @@ public class PackageTest {
     }
 
     @Test fun dottedNamePackage() {
-        verifyModel("test/data/packages/dottedNamePackage.kt") { model ->
+        verifyModel("testdata/packages/dottedNamePackage.kt") { model ->
             with(model.members.single()) {
                 assertEquals(DocumentationNode.Kind.Package, kind)
                 assertEquals("dot.name", name)
@@ -48,8 +48,8 @@ public class PackageTest {
     }
 
     @Test fun multipleFiles() {
-        verifyModel(KotlinSourceRoot("test/data/packages/dottedNamePackage.kt"),
-                    KotlinSourceRoot("test/data/packages/simpleNamePackage.kt")) { model ->
+        verifyModel(KotlinSourceRoot("testdata/packages/dottedNamePackage.kt"),
+                    KotlinSourceRoot("testdata/packages/simpleNamePackage.kt")) { model ->
             assertEquals(2, model.members.count())
             with(model.members.single { it.name == "simple" }) {
                 assertEquals(DocumentationNode.Kind.Package, kind)
@@ -70,8 +70,8 @@ public class PackageTest {
     }
 
     @Test fun multipleFilesSamePackage() {
-        verifyModel(KotlinSourceRoot("test/data/packages/simpleNamePackage.kt"),
-                    KotlinSourceRoot("test/data/packages/simpleNamePackage2.kt")) { model ->
+        verifyModel(KotlinSourceRoot("testdata/packages/simpleNamePackage.kt"),
+                    KotlinSourceRoot("testdata/packages/simpleNamePackage2.kt")) { model ->
             assertEquals(1, model.members.count())
             with(model.members.elementAt(0)) {
                 assertEquals(DocumentationNode.Kind.Package, kind)
diff --git a/test/src/model/PropertyTest.kt b/core/src/test/kotlin/model/PropertyTest.kt
index 093772b4..716aac54 100644
--- a/test/src/model/PropertyTest.kt
+++ b/core/src/test/kotlin/model/PropertyTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 
 public class PropertyTest {
     @Test fun valueProperty() {
-        verifyModel("test/data/properties/valueProperty.kt") { model ->
+        verifyModel("testdata/properties/valueProperty.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("property", name)
                 assertEquals(DocumentationNode.Kind.Property, kind)
@@ -22,7 +22,7 @@ public class PropertyTest {
     }
 
     @Test fun variableProperty() {
-        verifyModel("test/data/properties/variableProperty.kt") { model ->
+        verifyModel("testdata/properties/variableProperty.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("property", name)
                 assertEquals(DocumentationNode.Kind.Property, kind)
@@ -35,7 +35,7 @@ public class PropertyTest {
     }
 
     @Test fun valuePropertyWithGetter() {
-        verifyModel("test/data/properties/valuePropertyWithGetter.kt") { model ->
+        verifyModel("testdata/properties/valuePropertyWithGetter.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("property", name)
                 assertEquals(DocumentationNode.Kind.Property, kind)
@@ -48,7 +48,7 @@ public class PropertyTest {
     }
 
     @Test fun variablePropertyWithAccessors() {
-        verifyModel("test/data/properties/variablePropertyWithAccessors.kt") { model ->
+        verifyModel("testdata/properties/variablePropertyWithAccessors.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("property", name)
                 assertEquals(DocumentationNode.Kind.Property, kind)
@@ -65,7 +65,7 @@ public class PropertyTest {
     }
 
     @Test fun annotatedProperty() {
-        verifyModel("test/data/properties/annotatedProperty.kt", withKotlinRuntime = true) { model ->
+        verifyModel("testdata/properties/annotatedProperty.kt", withKotlinRuntime = true) { model ->
             with(model.members.single().members.single()) {
                 assertEquals(1, annotations.count())
                 with(annotations[0]) {
@@ -78,7 +78,7 @@ public class PropertyTest {
     }
 
     @Test fun propertyWithReceiver() {
-        verifyModel("test/data/properties/propertyWithReceiver.kt") { model ->
+        verifyModel("testdata/properties/propertyWithReceiver.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("kotlin.String", name)
                 assertEquals(DocumentationNode.Kind.ExternalClass, kind)
@@ -91,7 +91,7 @@ public class PropertyTest {
     }
 
     @Test fun propertyOverride() {
-        verifyModel("test/data/properties/propertyOverride.kt") { model ->
+        verifyModel("testdata/properties/propertyOverride.kt") { model ->
             with(model.members.single().members.single { it.name == "Bar" }.members.single { it.name == "xyzzy"}) {
                 assertEquals("xyzzy", name)
                 val override = references(DocumentationReference.Kind.Override).single().to
diff --git a/test/data/classes/annotatedClass.kt b/core/testdata/classes/annotatedClass.kt
index 1b58f56c..1b58f56c 100644
--- a/test/data/classes/annotatedClass.kt
+++ b/core/testdata/classes/annotatedClass.kt
diff --git a/test/data/classes/annotatedClassWithAnnotationParameters.kt b/core/testdata/classes/annotatedClassWithAnnotationParameters.kt
index 930d6a62..930d6a62 100644
--- a/test/data/classes/annotatedClassWithAnnotationParameters.kt
+++ b/core/testdata/classes/annotatedClassWithAnnotationParameters.kt
diff --git a/test/data/classes/classWithCompanionObject.kt b/core/testdata/classes/classWithCompanionObject.kt
index fdbd915d..fdbd915d 100644
--- a/test/data/classes/classWithCompanionObject.kt
+++ b/core/testdata/classes/classWithCompanionObject.kt
diff --git a/test/data/classes/classWithConstructor.kt b/core/testdata/classes/classWithConstructor.kt
index 0751d570..0751d570 100644
--- a/test/data/classes/classWithConstructor.kt
+++ b/core/testdata/classes/classWithConstructor.kt
diff --git a/test/data/classes/classWithFunction.kt b/core/testdata/classes/classWithFunction.kt
index a981cfb6..a981cfb6 100644
--- a/test/data/classes/classWithFunction.kt
+++ b/core/testdata/classes/classWithFunction.kt
diff --git a/test/data/classes/classWithProperty.kt b/core/testdata/classes/classWithProperty.kt
index 2a849572..2a849572 100644
--- a/test/data/classes/classWithProperty.kt
+++ b/core/testdata/classes/classWithProperty.kt
diff --git a/test/data/classes/companionObjectExtension.kt b/core/testdata/classes/companionObjectExtension.kt
index 4b471376..4b471376 100644
--- a/test/data/classes/companionObjectExtension.kt
+++ b/core/testdata/classes/companionObjectExtension.kt
diff --git a/test/data/classes/dataClass.kt b/core/testdata/classes/dataClass.kt
index 62c6f0ec..62c6f0ec 100644
--- a/test/data/classes/dataClass.kt
+++ b/core/testdata/classes/dataClass.kt
diff --git a/test/data/classes/emptyClass.kt b/core/testdata/classes/emptyClass.kt
index abd20cc8..abd20cc8 100644
--- a/test/data/classes/emptyClass.kt
+++ b/core/testdata/classes/emptyClass.kt
diff --git a/test/data/classes/emptyObject.kt b/core/testdata/classes/emptyObject.kt
index 4138bf31..4138bf31 100644
--- a/test/data/classes/emptyObject.kt
+++ b/core/testdata/classes/emptyObject.kt
diff --git a/test/data/classes/genericClass.kt b/core/testdata/classes/genericClass.kt
index db20ff7e..db20ff7e 100644
--- a/test/data/classes/genericClass.kt
+++ b/core/testdata/classes/genericClass.kt
diff --git a/test/data/classes/indirectOverride.kt b/core/testdata/classes/indirectOverride.kt
index 8d091b80..8d091b80 100644
--- a/test/data/classes/indirectOverride.kt
+++ b/core/testdata/classes/indirectOverride.kt
diff --git a/test/data/classes/innerClass.kt b/core/testdata/classes/innerClass.kt
index 3c6e497d..3c6e497d 100644
--- a/test/data/classes/innerClass.kt
+++ b/core/testdata/classes/innerClass.kt
diff --git a/test/data/classes/javaAnnotationClass.kt b/core/testdata/classes/javaAnnotationClass.kt
index 95600147..95600147 100644
--- a/test/data/classes/javaAnnotationClass.kt
+++ b/core/testdata/classes/javaAnnotationClass.kt
diff --git a/test/data/classes/notOpenClass.kt b/core/testdata/classes/notOpenClass.kt
index edee2c1a..edee2c1a 100644
--- a/test/data/classes/notOpenClass.kt
+++ b/core/testdata/classes/notOpenClass.kt
diff --git a/test/data/classes/sealedClass.kt b/core/testdata/classes/sealedClass.kt
index 93350393..93350393 100644
--- a/test/data/classes/sealedClass.kt
+++ b/core/testdata/classes/sealedClass.kt
diff --git a/test/data/classes/secondaryConstructor.kt b/core/testdata/classes/secondaryConstructor.kt
index e5cb2557..e5cb2557 100644
--- a/test/data/classes/secondaryConstructor.kt
+++ b/core/testdata/classes/secondaryConstructor.kt
diff --git a/test/data/comments/directive.kt b/core/testdata/comments/directive.kt
index b27f5a48..b27f5a48 100644
--- a/test/data/comments/directive.kt
+++ b/core/testdata/comments/directive.kt
diff --git a/test/data/comments/emptyDoc.kt b/core/testdata/comments/emptyDoc.kt
index b87cce57..b87cce57 100644
--- a/test/data/comments/emptyDoc.kt
+++ b/core/testdata/comments/emptyDoc.kt
diff --git a/test/data/comments/emptyDocButComment.kt b/core/testdata/comments/emptyDocButComment.kt
index ceb24753..ceb24753 100644
--- a/test/data/comments/emptyDocButComment.kt
+++ b/core/testdata/comments/emptyDocButComment.kt
diff --git a/test/data/comments/emptySection.kt b/core/testdata/comments/emptySection.kt
index 47d6b1a5..47d6b1a5 100644
--- a/test/data/comments/emptySection.kt
+++ b/core/testdata/comments/emptySection.kt
diff --git a/test/data/comments/multilineDoc.kt b/core/testdata/comments/multilineDoc.kt
index 31cfa3a7..31cfa3a7 100644
--- a/test/data/comments/multilineDoc.kt
+++ b/core/testdata/comments/multilineDoc.kt
diff --git a/test/data/comments/multilineDocWithComment.kt b/core/testdata/comments/multilineDocWithComment.kt
index 88d22642..88d22642 100644
--- a/test/data/comments/multilineDocWithComment.kt
+++ b/core/testdata/comments/multilineDocWithComment.kt
diff --git a/test/data/comments/multilineSection.kt b/core/testdata/comments/multilineSection.kt
index 6ef4df2c..6ef4df2c 100644
--- a/test/data/comments/multilineSection.kt
+++ b/core/testdata/comments/multilineSection.kt
diff --git a/test/data/comments/oneLineDoc.kt b/core/testdata/comments/oneLineDoc.kt
index 92a40c67..92a40c67 100644
--- a/test/data/comments/oneLineDoc.kt
+++ b/core/testdata/comments/oneLineDoc.kt
diff --git a/test/data/comments/oneLineDocWithComment.kt b/core/testdata/comments/oneLineDocWithComment.kt
index c8467933..c8467933 100644
--- a/test/data/comments/oneLineDocWithComment.kt
+++ b/core/testdata/comments/oneLineDocWithComment.kt
diff --git a/test/data/comments/oneLineDocWithEmptyLine.kt b/core/testdata/comments/oneLineDocWithEmptyLine.kt
index e364c416..e364c416 100644
--- a/test/data/comments/oneLineDocWithEmptyLine.kt
+++ b/core/testdata/comments/oneLineDocWithEmptyLine.kt
diff --git a/test/data/comments/section1.kt b/core/testdata/comments/section1.kt
index 7c763b4c..7c763b4c 100644
--- a/test/data/comments/section1.kt
+++ b/core/testdata/comments/section1.kt
diff --git a/test/data/comments/section2.kt b/core/testdata/comments/section2.kt
index e280793e..e280793e 100644
--- a/test/data/comments/section2.kt
+++ b/core/testdata/comments/section2.kt
diff --git a/test/data/format/accessor.kt b/core/testdata/format/accessor.kt
index 5a4d1742..5a4d1742 100644
--- a/test/data/format/accessor.kt
+++ b/core/testdata/format/accessor.kt
diff --git a/test/data/format/accessor.md b/core/testdata/format/accessor.md
index 8279f452..8279f452 100644
--- a/test/data/format/accessor.md
+++ b/core/testdata/format/accessor.md
diff --git a/test/data/format/annotatedTypeParameter.kt b/core/testdata/format/annotatedTypeParameter.kt
index cc3bfc1a..cc3bfc1a 100644
--- a/test/data/format/annotatedTypeParameter.kt
+++ b/core/testdata/format/annotatedTypeParameter.kt
diff --git a/test/data/format/annotatedTypeParameter.md b/core/testdata/format/annotatedTypeParameter.md
index 7d26a162..7d26a162 100644
--- a/test/data/format/annotatedTypeParameter.md
+++ b/core/testdata/format/annotatedTypeParameter.md
diff --git a/test/data/format/annotationClass.kt b/core/testdata/format/annotationClass.kt
index 89d494fb..89d494fb 100644
--- a/test/data/format/annotationClass.kt
+++ b/core/testdata/format/annotationClass.kt
diff --git a/test/data/format/annotationClass.md b/core/testdata/format/annotationClass.md
index 03548aa3..03548aa3 100644
--- a/test/data/format/annotationClass.md
+++ b/core/testdata/format/annotationClass.md
diff --git a/test/data/format/annotationParams.kt b/core/testdata/format/annotationParams.kt
index f259a740..f259a740 100644
--- a/test/data/format/annotationParams.kt
+++ b/core/testdata/format/annotationParams.kt
diff --git a/test/data/format/annotationParams.md b/core/testdata/format/annotationParams.md
index 8cdd6e96..8cdd6e96 100644
--- a/test/data/format/annotationParams.md
+++ b/core/testdata/format/annotationParams.md
diff --git a/test/data/format/annotations.kt b/core/testdata/format/annotations.kt
index 57f76249..57f76249 100644
--- a/test/data/format/annotations.kt
+++ b/core/testdata/format/annotations.kt
diff --git a/test/data/format/annotations.md b/core/testdata/format/annotations.md
index b898d55c..b898d55c 100644
--- a/test/data/format/annotations.md
+++ b/core/testdata/format/annotations.md
diff --git a/test/data/format/bracket.html b/core/testdata/format/bracket.html
index 5630073d..5630073d 100644
--- a/test/data/format/bracket.html
+++ b/core/testdata/format/bracket.html
diff --git a/test/data/format/bracket.kt b/core/testdata/format/bracket.kt
index d41b0073..d41b0073 100644
--- a/test/data/format/bracket.kt
+++ b/core/testdata/format/bracket.kt
diff --git a/test/data/format/brokenLink.html b/core/testdata/format/brokenLink.html
index 32135787..32135787 100644
--- a/test/data/format/brokenLink.html
+++ b/core/testdata/format/brokenLink.html
diff --git a/test/data/format/brokenLink.kt b/core/testdata/format/brokenLink.kt
index 268a986e..268a986e 100644
--- a/test/data/format/brokenLink.kt
+++ b/core/testdata/format/brokenLink.kt
diff --git a/test/data/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html
index be9247ea..be9247ea 100644
--- a/test/data/format/classWithCompanionObject.html
+++ b/core/testdata/format/classWithCompanionObject.html
diff --git a/test/data/format/classWithCompanionObject.kt b/core/testdata/format/classWithCompanionObject.kt
index fdbd915d..fdbd915d 100644
--- a/test/data/format/classWithCompanionObject.kt
+++ b/core/testdata/format/classWithCompanionObject.kt
diff --git a/test/data/format/classWithCompanionObject.md b/core/testdata/format/classWithCompanionObject.md
index 9398c3d3..9398c3d3 100644
--- a/test/data/format/classWithCompanionObject.md
+++ b/core/testdata/format/classWithCompanionObject.md
diff --git a/test/data/format/codeSpan.html b/core/testdata/format/codeSpan.html
index cc553043..cc553043 100644
--- a/test/data/format/codeSpan.html
+++ b/core/testdata/format/codeSpan.html
diff --git a/test/data/format/codeSpan.kt b/core/testdata/format/codeSpan.kt
index 645f454a..645f454a 100644
--- a/test/data/format/codeSpan.kt
+++ b/core/testdata/format/codeSpan.kt
diff --git a/test/data/format/companionObjectExtension.kt b/core/testdata/format/companionObjectExtension.kt
index f452de2c..f452de2c 100644
--- a/test/data/format/companionObjectExtension.kt
+++ b/core/testdata/format/companionObjectExtension.kt
diff --git a/test/data/format/companionObjectExtension.md b/core/testdata/format/companionObjectExtension.md
index 271da5b0..271da5b0 100644
--- a/test/data/format/companionObjectExtension.md
+++ b/core/testdata/format/companionObjectExtension.md
diff --git a/test/data/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
index e7b139d8..e7b139d8 100644
--- a/test/data/format/crossLanguage/kotlinExtendsJava/Bar.html
+++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
diff --git a/test/data/format/crossLanguage/kotlinExtendsJava/Bar.kt b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.kt
index 102782f9..102782f9 100644
--- a/test/data/format/crossLanguage/kotlinExtendsJava/Bar.kt
+++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.kt
diff --git a/test/data/format/crossLanguage/kotlinExtendsJava/test/Foo.java b/core/testdata/format/crossLanguage/kotlinExtendsJava/test/Foo.java
index 7c143030..7c143030 100644
--- a/test/data/format/crossLanguage/kotlinExtendsJava/test/Foo.java
+++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/test/Foo.java
diff --git a/test/data/format/deprecated.class.html b/core/testdata/format/deprecated.class.html
index 69da63a1..69da63a1 100644
--- a/test/data/format/deprecated.class.html
+++ b/core/testdata/format/deprecated.class.html
diff --git a/test/data/format/deprecated.kt b/core/testdata/format/deprecated.kt
index 4fc568c2..4fc568c2 100644
--- a/test/data/format/deprecated.kt
+++ b/core/testdata/format/deprecated.kt
diff --git a/test/data/format/deprecated.package.html b/core/testdata/format/deprecated.package.html
index dd80471c..dd80471c 100644
--- a/test/data/format/deprecated.package.html
+++ b/core/testdata/format/deprecated.package.html
diff --git a/test/data/format/emptyDescription.kt b/core/testdata/format/emptyDescription.kt
index 3ed81dfa..3ed81dfa 100644
--- a/test/data/format/emptyDescription.kt
+++ b/core/testdata/format/emptyDescription.kt
diff --git a/test/data/format/emptyDescription.md b/core/testdata/format/emptyDescription.md
index e82e7228..e82e7228 100644
--- a/test/data/format/emptyDescription.md
+++ b/core/testdata/format/emptyDescription.md
diff --git a/test/data/format/entity.html b/core/testdata/format/entity.html
index a939faad..a939faad 100644
--- a/test/data/format/entity.html
+++ b/core/testdata/format/entity.html
diff --git a/test/data/format/entity.kt b/core/testdata/format/entity.kt
index 163d2ee6..163d2ee6 100644
--- a/test/data/format/entity.kt
+++ b/core/testdata/format/entity.kt
diff --git a/test/data/format/enumClass.kt b/core/testdata/format/enumClass.kt
index c1af69d8..c1af69d8 100644
--- a/test/data/format/enumClass.kt
+++ b/core/testdata/format/enumClass.kt
diff --git a/test/data/format/enumClass.md b/core/testdata/format/enumClass.md
index 7a0e03ff..7a0e03ff 100644
--- a/test/data/format/enumClass.md
+++ b/core/testdata/format/enumClass.md
diff --git a/test/data/format/enumClass.value.md b/core/testdata/format/enumClass.value.md
index bcb685d1..bcb685d1 100644
--- a/test/data/format/enumClass.value.md
+++ b/core/testdata/format/enumClass.value.md
diff --git a/test/data/format/extensionFunctionParameter.kt b/core/testdata/format/extensionFunctionParameter.kt
index bfb344b9..bfb344b9 100644
--- a/test/data/format/extensionFunctionParameter.kt
+++ b/core/testdata/format/extensionFunctionParameter.kt
diff --git a/test/data/format/extensionFunctionParameter.md b/core/testdata/format/extensionFunctionParameter.md
index 6980912d..6980912d 100644
--- a/test/data/format/extensionFunctionParameter.md
+++ b/core/testdata/format/extensionFunctionParameter.md
diff --git a/test/data/format/extensions.class.md b/core/testdata/format/extensions.class.md
index c66cdb01..c66cdb01 100644
--- a/test/data/format/extensions.class.md
+++ b/core/testdata/format/extensions.class.md
diff --git a/test/data/format/extensions.kt b/core/testdata/format/extensions.kt
index 6f2eff9d..6f2eff9d 100644
--- a/test/data/format/extensions.kt
+++ b/core/testdata/format/extensions.kt
diff --git a/test/data/format/extensions.package.md b/core/testdata/format/extensions.package.md
index 76ff3676..76ff3676 100644
--- a/test/data/format/extensions.package.md
+++ b/core/testdata/format/extensions.package.md
diff --git a/test/data/format/functionWithDefaultParameter.kt b/core/testdata/format/functionWithDefaultParameter.kt
index 3a3a102f..3a3a102f 100644
--- a/test/data/format/functionWithDefaultParameter.kt
+++ b/core/testdata/format/functionWithDefaultParameter.kt
diff --git a/test/data/format/functionWithDefaultParameter.md b/core/testdata/format/functionWithDefaultParameter.md
index 21e9eff7..21e9eff7 100644
--- a/test/data/format/functionWithDefaultParameter.md
+++ b/core/testdata/format/functionWithDefaultParameter.md
diff --git a/test/data/format/htmlEscaping.html b/core/testdata/format/htmlEscaping.html
index a485c08f..a485c08f 100644
--- a/test/data/format/htmlEscaping.html
+++ b/core/testdata/format/htmlEscaping.html
diff --git a/test/data/format/htmlEscaping.kt b/core/testdata/format/htmlEscaping.kt
index 8778d8a5..8778d8a5 100644
--- a/test/data/format/htmlEscaping.kt
+++ b/core/testdata/format/htmlEscaping.kt
diff --git a/test/data/format/inheritedExtensions.kt b/core/testdata/format/inheritedExtensions.kt
index e38fe00d..e38fe00d 100644
--- a/test/data/format/inheritedExtensions.kt
+++ b/core/testdata/format/inheritedExtensions.kt
diff --git a/test/data/format/inheritedExtensions.md b/core/testdata/format/inheritedExtensions.md
index 79137eac..79137eac 100644
--- a/test/data/format/inheritedExtensions.md
+++ b/core/testdata/format/inheritedExtensions.md
diff --git a/test/data/format/inheritedMembers.kt b/core/testdata/format/inheritedMembers.kt
index 2d0c4ca1..2d0c4ca1 100644
--- a/test/data/format/inheritedMembers.kt
+++ b/core/testdata/format/inheritedMembers.kt
diff --git a/test/data/format/inheritedMembers.md b/core/testdata/format/inheritedMembers.md
index d58d3974..d58d3974 100644
--- a/test/data/format/inheritedMembers.md
+++ b/core/testdata/format/inheritedMembers.md
diff --git a/test/data/format/javaCodeInParam.java b/core/testdata/format/javaCodeInParam.java
index 73025fcc..73025fcc 100644
--- a/test/data/format/javaCodeInParam.java
+++ b/core/testdata/format/javaCodeInParam.java
diff --git a/test/data/format/javaCodeInParam.md b/core/testdata/format/javaCodeInParam.md
index b1d2d871..b1d2d871 100644
--- a/test/data/format/javaCodeInParam.md
+++ b/core/testdata/format/javaCodeInParam.md
diff --git a/test/data/format/javaCodeLiteralTags.java b/core/testdata/format/javaCodeLiteralTags.java
index e71ddaa7..e71ddaa7 100644
--- a/test/data/format/javaCodeLiteralTags.java
+++ b/core/testdata/format/javaCodeLiteralTags.java
diff --git a/test/data/format/javaCodeLiteralTags.md b/core/testdata/format/javaCodeLiteralTags.md
index 83c9cc33..83c9cc33 100644
--- a/test/data/format/javaCodeLiteralTags.md
+++ b/core/testdata/format/javaCodeLiteralTags.md
diff --git a/test/data/format/javaDeprecated.html b/core/testdata/format/javaDeprecated.html
index 236c6490..236c6490 100644
--- a/test/data/format/javaDeprecated.html
+++ b/core/testdata/format/javaDeprecated.html
diff --git a/test/data/format/javaDeprecated.java b/core/testdata/format/javaDeprecated.java
index 9694a444..9694a444 100644
--- a/test/data/format/javaDeprecated.java
+++ b/core/testdata/format/javaDeprecated.java
diff --git a/test/data/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html
index 1b6921ab..1b6921ab 100644
--- a/test/data/format/javaLinkTag.html
+++ b/core/testdata/format/javaLinkTag.html
diff --git a/test/data/format/javaLinkTag.java b/core/testdata/format/javaLinkTag.java
index 84f761c6..84f761c6 100644
--- a/test/data/format/javaLinkTag.java
+++ b/core/testdata/format/javaLinkTag.java
diff --git a/test/data/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html
index aabfbc58..aabfbc58 100644
--- a/test/data/format/javaLinkTagWithLabel.html
+++ b/core/testdata/format/javaLinkTagWithLabel.html
diff --git a/test/data/format/javaLinkTagWithLabel.java b/core/testdata/format/javaLinkTagWithLabel.java
index 1db5ad70..1db5ad70 100644
--- a/test/data/format/javaLinkTagWithLabel.java
+++ b/core/testdata/format/javaLinkTagWithLabel.java
diff --git a/test/data/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html
index a6813df3..a6813df3 100644
--- a/test/data/format/javaSeeTag.html
+++ b/core/testdata/format/javaSeeTag.html
diff --git a/test/data/format/javaSeeTag.java b/core/testdata/format/javaSeeTag.java
index 94a24606..94a24606 100644
--- a/test/data/format/javaSeeTag.java
+++ b/core/testdata/format/javaSeeTag.java
diff --git a/test/data/format/javaSpaceInAuthor.java b/core/testdata/format/javaSpaceInAuthor.java
index f980ae07..f980ae07 100644
--- a/test/data/format/javaSpaceInAuthor.java
+++ b/core/testdata/format/javaSpaceInAuthor.java
diff --git a/test/data/format/javaSpaceInAuthor.md b/core/testdata/format/javaSpaceInAuthor.md
index 4d19ed01..4d19ed01 100644
--- a/test/data/format/javaSpaceInAuthor.md
+++ b/core/testdata/format/javaSpaceInAuthor.md
diff --git a/test/data/format/javaSupertype.html b/core/testdata/format/javaSupertype.html
index 4c847281..4c847281 100644
--- a/test/data/format/javaSupertype.html
+++ b/core/testdata/format/javaSupertype.html
diff --git a/test/data/format/javaSupertype.java b/core/testdata/format/javaSupertype.java
index b3142ff6..b3142ff6 100644
--- a/test/data/format/javaSupertype.java
+++ b/core/testdata/format/javaSupertype.java
diff --git a/test/data/format/javadocHtml.java b/core/testdata/format/javadocHtml.java
index 622116b2..622116b2 100644
--- a/test/data/format/javadocHtml.java
+++ b/core/testdata/format/javadocHtml.java
diff --git a/test/data/format/javadocHtml.md b/core/testdata/format/javadocHtml.md
index db71cc3b..db71cc3b 100644
--- a/test/data/format/javadocHtml.md
+++ b/core/testdata/format/javadocHtml.md
diff --git a/test/data/format/javadocOrderedList.java b/core/testdata/format/javadocOrderedList.java
index c32d9032..c32d9032 100644
--- a/test/data/format/javadocOrderedList.java
+++ b/core/testdata/format/javadocOrderedList.java
diff --git a/test/data/format/javadocOrderedList.md b/core/testdata/format/javadocOrderedList.md
index 02a3c095..02a3c095 100644
--- a/test/data/format/javadocOrderedList.md
+++ b/core/testdata/format/javadocOrderedList.md
diff --git a/test/data/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html
index 75769ffd..75769ffd 100644
--- a/test/data/format/linkWithLabel.html
+++ b/core/testdata/format/linkWithLabel.html
diff --git a/test/data/format/linkWithLabel.kt b/core/testdata/format/linkWithLabel.kt
index 4a85c505..4a85c505 100644
--- a/test/data/format/linkWithLabel.kt
+++ b/core/testdata/format/linkWithLabel.kt
diff --git a/test/data/format/nullability.kt b/core/testdata/format/nullability.kt
index d1d4545b..d1d4545b 100644
--- a/test/data/format/nullability.kt
+++ b/core/testdata/format/nullability.kt
diff --git a/test/data/format/nullability.md b/core/testdata/format/nullability.md
index ee50a0a5..ee50a0a5 100644
--- a/test/data/format/nullability.md
+++ b/core/testdata/format/nullability.md
diff --git a/test/data/format/operatorOverloading.kt b/core/testdata/format/operatorOverloading.kt
index 6fe78e45..6fe78e45 100644
--- a/test/data/format/operatorOverloading.kt
+++ b/core/testdata/format/operatorOverloading.kt
diff --git a/test/data/format/operatorOverloading.md b/core/testdata/format/operatorOverloading.md
index 05fe3206..05fe3206 100644
--- a/test/data/format/operatorOverloading.md
+++ b/core/testdata/format/operatorOverloading.md
diff --git a/test/data/format/orderedList.html b/core/testdata/format/orderedList.html
index 9917568f..9917568f 100644
--- a/test/data/format/orderedList.html
+++ b/core/testdata/format/orderedList.html
diff --git a/test/data/format/orderedList.kt b/core/testdata/format/orderedList.kt
index 03681c7a..03681c7a 100644
--- a/test/data/format/orderedList.kt
+++ b/core/testdata/format/orderedList.kt
diff --git a/test/data/format/overloads.html b/core/testdata/format/overloads.html
index 752f3989..752f3989 100644
--- a/test/data/format/overloads.html
+++ b/core/testdata/format/overloads.html
diff --git a/test/data/format/overloads.kt b/core/testdata/format/overloads.kt
index dcd2d097..dcd2d097 100644
--- a/test/data/format/overloads.kt
+++ b/core/testdata/format/overloads.kt
diff --git a/test/data/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html
index a0efb472..a0efb472 100644
--- a/test/data/format/overloadsWithDescription.html
+++ b/core/testdata/format/overloadsWithDescription.html
diff --git a/test/data/format/overloadsWithDescription.kt b/core/testdata/format/overloadsWithDescription.kt
index 740e642f..740e642f 100644
--- a/test/data/format/overloadsWithDescription.kt
+++ b/core/testdata/format/overloadsWithDescription.kt
diff --git a/test/data/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html
index 30a37e75..30a37e75 100644
--- a/test/data/format/overloadsWithDifferentDescriptions.html
+++ b/core/testdata/format/overloadsWithDifferentDescriptions.html
diff --git a/test/data/format/overloadsWithDifferentDescriptions.kt b/core/testdata/format/overloadsWithDifferentDescriptions.kt
index ad3169b0..ad3169b0 100644
--- a/test/data/format/overloadsWithDifferentDescriptions.kt
+++ b/core/testdata/format/overloadsWithDifferentDescriptions.kt
diff --git a/test/data/format/overridingFunction.kt b/core/testdata/format/overridingFunction.kt
index d7329489..d7329489 100644
--- a/test/data/format/overridingFunction.kt
+++ b/core/testdata/format/overridingFunction.kt
diff --git a/test/data/format/overridingFunction.md b/core/testdata/format/overridingFunction.md
index 2c898b9c..2c898b9c 100644
--- a/test/data/format/overridingFunction.md
+++ b/core/testdata/format/overridingFunction.md
diff --git a/test/data/format/paramTag.kt b/core/testdata/format/paramTag.kt
index 47e471f5..47e471f5 100644
--- a/test/data/format/paramTag.kt
+++ b/core/testdata/format/paramTag.kt
diff --git a/test/data/format/paramTag.md b/core/testdata/format/paramTag.md
index 882083fe..882083fe 100644
--- a/test/data/format/paramTag.md
+++ b/core/testdata/format/paramTag.md
diff --git a/test/data/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html
index c5920fb7..c5920fb7 100644
--- a/test/data/format/parameterAnchor.html
+++ b/core/testdata/format/parameterAnchor.html
diff --git a/test/data/format/parameterAnchor.kt b/core/testdata/format/parameterAnchor.kt
index ae36ee4c..ae36ee4c 100644
--- a/test/data/format/parameterAnchor.kt
+++ b/core/testdata/format/parameterAnchor.kt
diff --git a/test/data/format/parenthesis.html b/core/testdata/format/parenthesis.html
index c36b311b..c36b311b 100644
--- a/test/data/format/parenthesis.html
+++ b/core/testdata/format/parenthesis.html
diff --git a/test/data/format/parenthesis.kt b/core/testdata/format/parenthesis.kt
index b906f64a..b906f64a 100644
--- a/test/data/format/parenthesis.kt
+++ b/core/testdata/format/parenthesis.kt
diff --git a/test/data/format/propertyVar.kt b/core/testdata/format/propertyVar.kt
index 88be1a7a..88be1a7a 100644
--- a/test/data/format/propertyVar.kt
+++ b/core/testdata/format/propertyVar.kt
diff --git a/test/data/format/propertyVar.md b/core/testdata/format/propertyVar.md
index f2110992..f2110992 100644
--- a/test/data/format/propertyVar.md
+++ b/core/testdata/format/propertyVar.md
diff --git a/test/data/format/reifiedTypeParameter.kt b/core/testdata/format/reifiedTypeParameter.kt
index 00fa1dc9..00fa1dc9 100644
--- a/test/data/format/reifiedTypeParameter.kt
+++ b/core/testdata/format/reifiedTypeParameter.kt
diff --git a/test/data/format/reifiedTypeParameter.md b/core/testdata/format/reifiedTypeParameter.md
index 2e96018e..2e96018e 100644
--- a/test/data/format/reifiedTypeParameter.md
+++ b/core/testdata/format/reifiedTypeParameter.md
diff --git a/test/data/format/see.html b/core/testdata/format/see.html
index b3ffb74b..b3ffb74b 100644
--- a/test/data/format/see.html
+++ b/core/testdata/format/see.html
diff --git a/test/data/format/see.kt b/core/testdata/format/see.kt
index a0b153b0..a0b153b0 100644
--- a/test/data/format/see.kt
+++ b/core/testdata/format/see.kt
diff --git a/test/data/format/starProjection.kt b/core/testdata/format/starProjection.kt
index 48d53e47..48d53e47 100644
--- a/test/data/format/starProjection.kt
+++ b/core/testdata/format/starProjection.kt
diff --git a/test/data/format/starProjection.md b/core/testdata/format/starProjection.md
index c9be2f58..c9be2f58 100644
--- a/test/data/format/starProjection.md
+++ b/core/testdata/format/starProjection.md
diff --git a/test/data/format/summarizeSignatures.kt b/core/testdata/format/summarizeSignatures.kt
index 1d875a50..1d875a50 100644
--- a/test/data/format/summarizeSignatures.kt
+++ b/core/testdata/format/summarizeSignatures.kt
diff --git a/test/data/format/summarizeSignatures.md b/core/testdata/format/summarizeSignatures.md
index b1707f40..b1707f40 100644
--- a/test/data/format/summarizeSignatures.md
+++ b/core/testdata/format/summarizeSignatures.md
diff --git a/test/data/format/summarizeSignaturesProperty.kt b/core/testdata/format/summarizeSignaturesProperty.kt
index fbbdd328..fbbdd328 100644
--- a/test/data/format/summarizeSignaturesProperty.kt
+++ b/core/testdata/format/summarizeSignaturesProperty.kt
diff --git a/test/data/format/summarizeSignaturesProperty.md b/core/testdata/format/summarizeSignaturesProperty.md
index 9646b0f1..9646b0f1 100644
--- a/test/data/format/summarizeSignaturesProperty.md
+++ b/core/testdata/format/summarizeSignaturesProperty.md
diff --git a/test/data/format/throwsTag.kt b/core/testdata/format/throwsTag.kt
index 29a9c3f7..29a9c3f7 100644
--- a/test/data/format/throwsTag.kt
+++ b/core/testdata/format/throwsTag.kt
diff --git a/test/data/format/throwsTag.md b/core/testdata/format/throwsTag.md
index d0a4e610..d0a4e610 100644
--- a/test/data/format/throwsTag.md
+++ b/core/testdata/format/throwsTag.md
diff --git a/test/data/format/tripleBackticks.html b/core/testdata/format/tripleBackticks.html
index 13954985..13954985 100644
--- a/test/data/format/tripleBackticks.html
+++ b/core/testdata/format/tripleBackticks.html
diff --git a/test/data/format/tripleBackticks.kt b/core/testdata/format/tripleBackticks.kt
index 54dfa6d5..54dfa6d5 100644
--- a/test/data/format/tripleBackticks.kt
+++ b/core/testdata/format/tripleBackticks.kt
diff --git a/test/data/format/typeLink.html b/core/testdata/format/typeLink.html
index ff99090a..ff99090a 100644
--- a/test/data/format/typeLink.html
+++ b/core/testdata/format/typeLink.html
diff --git a/test/data/format/typeLink.kt b/core/testdata/format/typeLink.kt
index 966e020e..966e020e 100644
--- a/test/data/format/typeLink.kt
+++ b/core/testdata/format/typeLink.kt
diff --git a/test/data/format/typeParameterBounds.kt b/core/testdata/format/typeParameterBounds.kt
index 5f22f8c5..5f22f8c5 100644
--- a/test/data/format/typeParameterBounds.kt
+++ b/core/testdata/format/typeParameterBounds.kt
diff --git a/test/data/format/typeParameterBounds.md b/core/testdata/format/typeParameterBounds.md
index fe597878..fe597878 100644
--- a/test/data/format/typeParameterBounds.md
+++ b/core/testdata/format/typeParameterBounds.md
diff --git a/test/data/format/typeParameterVariance.kt b/core/testdata/format/typeParameterVariance.kt
index 28b29f4b..28b29f4b 100644
--- a/test/data/format/typeParameterVariance.kt
+++ b/core/testdata/format/typeParameterVariance.kt
diff --git a/test/data/format/typeParameterVariance.md b/core/testdata/format/typeParameterVariance.md
index c0bfa6de..c0bfa6de 100644
--- a/test/data/format/typeParameterVariance.md
+++ b/core/testdata/format/typeParameterVariance.md
diff --git a/test/data/format/typeProjectionVariance.kt b/core/testdata/format/typeProjectionVariance.kt
index 85ee344d..85ee344d 100644
--- a/test/data/format/typeProjectionVariance.kt
+++ b/core/testdata/format/typeProjectionVariance.kt
diff --git a/test/data/format/typeProjectionVariance.md b/core/testdata/format/typeProjectionVariance.md
index 7aa34593..7aa34593 100644
--- a/test/data/format/typeProjectionVariance.md
+++ b/core/testdata/format/typeProjectionVariance.md
diff --git a/test/data/format/varargsFunction.kt b/core/testdata/format/varargsFunction.kt
index deea127b..deea127b 100644
--- a/test/data/format/varargsFunction.kt
+++ b/core/testdata/format/varargsFunction.kt
diff --git a/test/data/format/varargsFunction.md b/core/testdata/format/varargsFunction.md
index 723437aa..723437aa 100644
--- a/test/data/format/varargsFunction.md
+++ b/core/testdata/format/varargsFunction.md
diff --git a/test/data/functions/annotatedFunction.kt b/core/testdata/functions/annotatedFunction.kt
index f7abbf6c..f7abbf6c 100644
--- a/test/data/functions/annotatedFunction.kt
+++ b/core/testdata/functions/annotatedFunction.kt
diff --git a/test/data/functions/annotatedFunctionWithAnnotationParameters.kt b/core/testdata/functions/annotatedFunctionWithAnnotationParameters.kt
index e559713a..e559713a 100644
--- a/test/data/functions/annotatedFunctionWithAnnotationParameters.kt
+++ b/core/testdata/functions/annotatedFunctionWithAnnotationParameters.kt
diff --git a/test/data/functions/function.kt b/core/testdata/functions/function.kt
index 3ed81dfa..3ed81dfa 100644
--- a/test/data/functions/function.kt
+++ b/core/testdata/functions/function.kt
diff --git a/test/data/functions/functionWithAnnotatedParam.kt b/core/testdata/functions/functionWithAnnotatedParam.kt
index f858e671..f858e671 100644
--- a/test/data/functions/functionWithAnnotatedParam.kt
+++ b/core/testdata/functions/functionWithAnnotatedParam.kt
diff --git a/test/data/functions/functionWithDefaultParameter.kt b/core/testdata/functions/functionWithDefaultParameter.kt
index 3a3a102f..3a3a102f 100644
--- a/test/data/functions/functionWithDefaultParameter.kt
+++ b/core/testdata/functions/functionWithDefaultParameter.kt
diff --git a/test/data/functions/functionWithNoinlineParam.kt b/core/testdata/functions/functionWithNoinlineParam.kt
index 640bec83..640bec83 100644
--- a/test/data/functions/functionWithNoinlineParam.kt
+++ b/core/testdata/functions/functionWithNoinlineParam.kt
diff --git a/test/data/functions/functionWithNotDocumentedAnnotation.kt b/core/testdata/functions/functionWithNotDocumentedAnnotation.kt
index 3c7e2ff9..3c7e2ff9 100644
--- a/test/data/functions/functionWithNotDocumentedAnnotation.kt
+++ b/core/testdata/functions/functionWithNotDocumentedAnnotation.kt
diff --git a/test/data/functions/functionWithParams.kt b/core/testdata/functions/functionWithParams.kt
index 85c49368..85c49368 100644
--- a/test/data/functions/functionWithParams.kt
+++ b/core/testdata/functions/functionWithParams.kt
diff --git a/test/data/functions/functionWithReceiver.kt b/core/testdata/functions/functionWithReceiver.kt
index c8473251..c8473251 100644
--- a/test/data/functions/functionWithReceiver.kt
+++ b/core/testdata/functions/functionWithReceiver.kt
diff --git a/test/data/functions/genericFunction.kt b/core/testdata/functions/genericFunction.kt
index 05a65070..05a65070 100644
--- a/test/data/functions/genericFunction.kt
+++ b/core/testdata/functions/genericFunction.kt
diff --git a/test/data/functions/genericFunctionWithConstraints.kt b/core/testdata/functions/genericFunctionWithConstraints.kt
index 5f22f8c5..5f22f8c5 100644
--- a/test/data/functions/genericFunctionWithConstraints.kt
+++ b/core/testdata/functions/genericFunctionWithConstraints.kt
diff --git a/test/data/functions/inlineFunction.kt b/core/testdata/functions/inlineFunction.kt
index 11c19672..11c19672 100644
--- a/test/data/functions/inlineFunction.kt
+++ b/core/testdata/functions/inlineFunction.kt
diff --git a/test/data/java/annotatedAnnotation.java b/core/testdata/java/annotatedAnnotation.java
index 6296e400..6296e400 100644
--- a/test/data/java/annotatedAnnotation.java
+++ b/core/testdata/java/annotatedAnnotation.java
diff --git a/test/data/java/arrayType.java b/core/testdata/java/arrayType.java
index dc42a207..dc42a207 100644
--- a/test/data/java/arrayType.java
+++ b/core/testdata/java/arrayType.java
diff --git a/test/data/java/constructors.java b/core/testdata/java/constructors.java
index 6f899d18..6f899d18 100644
--- a/test/data/java/constructors.java
+++ b/core/testdata/java/constructors.java
diff --git a/test/data/java/deprecation.java b/core/testdata/java/deprecation.java
index be8decd6..be8decd6 100644
--- a/test/data/java/deprecation.java
+++ b/core/testdata/java/deprecation.java
diff --git a/test/data/java/enumValues.java b/core/testdata/java/enumValues.java
index d8dda934..d8dda934 100644
--- a/test/data/java/enumValues.java
+++ b/core/testdata/java/enumValues.java
diff --git a/test/data/java/field.java b/core/testdata/java/field.java
index d9ae75f9..d9ae75f9 100644
--- a/test/data/java/field.java
+++ b/core/testdata/java/field.java
diff --git a/test/data/java/inheritorLinks.java b/core/testdata/java/inheritorLinks.java
index 2378f5c6..2378f5c6 100644
--- a/test/data/java/inheritorLinks.java
+++ b/core/testdata/java/inheritorLinks.java
diff --git a/test/data/java/innerClass.java b/core/testdata/java/innerClass.java
index 0f1be948..0f1be948 100644
--- a/test/data/java/innerClass.java
+++ b/core/testdata/java/innerClass.java
diff --git a/test/data/java/javaLangObject.java b/core/testdata/java/javaLangObject.java
index be3dd570..be3dd570 100644
--- a/test/data/java/javaLangObject.java
+++ b/core/testdata/java/javaLangObject.java
diff --git a/test/data/java/member.java b/core/testdata/java/member.java
index d4f4b8d5..d4f4b8d5 100644
--- a/test/data/java/member.java
+++ b/core/testdata/java/member.java
diff --git a/test/data/java/memberWithModifiers.java b/core/testdata/java/memberWithModifiers.java
index ea645c21..ea645c21 100644
--- a/test/data/java/memberWithModifiers.java
+++ b/core/testdata/java/memberWithModifiers.java
diff --git a/test/data/java/staticMethod.java b/core/testdata/java/staticMethod.java
index a2ecd7f1..a2ecd7f1 100644
--- a/test/data/java/staticMethod.java
+++ b/core/testdata/java/staticMethod.java
diff --git a/test/data/java/superClass.java b/core/testdata/java/superClass.java
index 31b5fa96..31b5fa96 100644
--- a/test/data/java/superClass.java
+++ b/core/testdata/java/superClass.java
diff --git a/test/data/java/typeParameter.java b/core/testdata/java/typeParameter.java
index 5a24b30a..5a24b30a 100644
--- a/test/data/java/typeParameter.java
+++ b/core/testdata/java/typeParameter.java
diff --git a/test/data/java/varargs.java b/core/testdata/java/varargs.java
index d184564e..d184564e 100644
--- a/test/data/java/varargs.java
+++ b/core/testdata/java/varargs.java
diff --git a/javadoc/src/test/data/obj.kt b/core/testdata/javadoc/obj.kt
index 1d10a422..1d10a422 100644
--- a/javadoc/src/test/data/obj.kt
+++ b/core/testdata/javadoc/obj.kt
diff --git a/javadoc/src/test/data/types.kt b/core/testdata/javadoc/types.kt
index 55be6058..55be6058 100644
--- a/javadoc/src/test/data/types.kt
+++ b/core/testdata/javadoc/types.kt
diff --git a/test/data/links/linkToJDK.kt b/core/testdata/links/linkToJDK.kt
index e69de29b..e69de29b 100644
--- a/test/data/links/linkToJDK.kt
+++ b/core/testdata/links/linkToJDK.kt
diff --git a/test/data/links/linkToMember.kt b/core/testdata/links/linkToMember.kt
index b60eaedb..b60eaedb 100644
--- a/test/data/links/linkToMember.kt
+++ b/core/testdata/links/linkToMember.kt
diff --git a/test/data/links/linkToParam.kt b/core/testdata/links/linkToParam.kt
index ca42a742..ca42a742 100644
--- a/test/data/links/linkToParam.kt
+++ b/core/testdata/links/linkToParam.kt
diff --git a/test/data/links/linkToQualifiedMember.kt b/core/testdata/links/linkToQualifiedMember.kt
index 22c154fe..22c154fe 100644
--- a/test/data/links/linkToQualifiedMember.kt
+++ b/core/testdata/links/linkToQualifiedMember.kt
diff --git a/test/data/links/linkToSelf.kt b/core/testdata/links/linkToSelf.kt
index 74395f0f..74395f0f 100644
--- a/test/data/links/linkToSelf.kt
+++ b/core/testdata/links/linkToSelf.kt
diff --git a/test/data/markdown/spec.txt b/core/testdata/markdown/spec.txt
index fce87924..fce87924 100644
--- a/test/data/markdown/spec.txt
+++ b/core/testdata/markdown/spec.txt
diff --git a/test/data/packagedocs/stdlib.md b/core/testdata/packagedocs/stdlib.md
index 5d7432b5..5d7432b5 100644
--- a/test/data/packagedocs/stdlib.md
+++ b/core/testdata/packagedocs/stdlib.md
diff --git a/test/data/packages/dottedNamePackage.kt b/core/testdata/packages/dottedNamePackage.kt
index 38619310..38619310 100644
--- a/test/data/packages/dottedNamePackage.kt
+++ b/core/testdata/packages/dottedNamePackage.kt
diff --git a/test/data/packages/rootPackage.kt b/core/testdata/packages/rootPackage.kt
index e69de29b..e69de29b 100644
--- a/test/data/packages/rootPackage.kt
+++ b/core/testdata/packages/rootPackage.kt
diff --git a/test/data/packages/simpleNamePackage.kt b/core/testdata/packages/simpleNamePackage.kt
index 2c29f4c7..2c29f4c7 100644
--- a/test/data/packages/simpleNamePackage.kt
+++ b/core/testdata/packages/simpleNamePackage.kt
diff --git a/test/data/packages/simpleNamePackage2.kt b/core/testdata/packages/simpleNamePackage2.kt
index 2c29f4c7..2c29f4c7 100644
--- a/test/data/packages/simpleNamePackage2.kt
+++ b/core/testdata/packages/simpleNamePackage2.kt
diff --git a/test/data/properties/annotatedProperty.kt b/core/testdata/properties/annotatedProperty.kt
index 8990af29..8990af29 100644
--- a/test/data/properties/annotatedProperty.kt
+++ b/core/testdata/properties/annotatedProperty.kt
diff --git a/test/data/properties/propertyOverride.kt b/core/testdata/properties/propertyOverride.kt
index 625d1da0..625d1da0 100644
--- a/test/data/properties/propertyOverride.kt
+++ b/core/testdata/properties/propertyOverride.kt
diff --git a/test/data/properties/propertyWithReceiver.kt b/core/testdata/properties/propertyWithReceiver.kt
index e282f6bd..e282f6bd 100644
--- a/test/data/properties/propertyWithReceiver.kt
+++ b/core/testdata/properties/propertyWithReceiver.kt
diff --git a/test/data/properties/valueProperty.kt b/core/testdata/properties/valueProperty.kt
index b87cce57..b87cce57 100644
--- a/test/data/properties/valueProperty.kt
+++ b/core/testdata/properties/valueProperty.kt
diff --git a/test/data/properties/valuePropertyWithGetter.kt b/core/testdata/properties/valuePropertyWithGetter.kt
index 64d3848c..64d3848c 100644
--- a/test/data/properties/valuePropertyWithGetter.kt
+++ b/core/testdata/properties/valuePropertyWithGetter.kt
diff --git a/test/data/properties/variableProperty.kt b/core/testdata/properties/variableProperty.kt
index 54ab4595..54ab4595 100644
--- a/test/data/properties/variableProperty.kt
+++ b/core/testdata/properties/variableProperty.kt
diff --git a/test/data/properties/variablePropertyWithAccessors.kt b/core/testdata/properties/variablePropertyWithAccessors.kt
index 152fb7d0..152fb7d0 100644
--- a/test/data/properties/variablePropertyWithAccessors.kt
+++ b/core/testdata/properties/variablePropertyWithAccessors.kt
diff --git a/dokka-fatjar/build.gradle b/dokka-fatjar/build.gradle
deleted file mode 100644
index 6f7d0d63..00000000
--- a/dokka-fatjar/build.gradle
+++ /dev/null
@@ -1,107 +0,0 @@
-group 'org.jetbrains.dokka'
-version dokka_version
-import proguard.gradle.ProGuardTask
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'net.sf.proguard:proguard-gradle:5.2.1'
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.5'
-    distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
-}
-
-task sourceJar(type: Jar) {
-    from fileTree('../src')
-}
-
-task proguard(type: ProGuardTask) {
-    configuration 'dokka.pro'
-
-    injars "build/libs/dokka-fatjar-${dokka_version}.jar"
-    outjars "build/libs/dokka-fatjar-${dokka_version}.out.jar"
-}
-proguard.doLast {
-    def inFile = new File("$projectDir/build/libs/dokka-fatjar-${dokka_version}.jar")
-    if (!inFile.exists()) {
-        throw new IOException("Could not find Proguard input file ${inFile.absolutePath}")
-    }
-    inFile.renameTo("$projectDir/build/libs/dokka-fatjar-${dokka_version}.in.jar")
-    new File("$projectDir/build/libs/dokka-fatjar-${dokka_version}.out.jar").renameTo(inFile)
-}
-
-jar {
-    manifest {
-        attributes "Implementation-Title": "Dokka Kotlin Documentation tool"
-        attributes "Implementation-Version": version
-        attributes "Main-Class" : "org.jetbrains.dokka.MainKt"
-    }
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    fileTree(project.file('../lib')).filter {
-        it.name.endsWith('.jar') &&
-                !it.name.contains("-sources") &&
-                !it.name.contains("-javadoc")
-    }.each {
-        from (zipTree(it)) {
-            exclude 'META-INF/MANIFEST.MF'
-            exclude 'META-INF/*.SF'
-            exclude 'META-INF/*.DSA'
-            exclude 'META-INF/*.RSA'
-            exclude '**/*.kt'
-            exclude '**/*.java'
-            exclude '**/*.md'
-        }
-    }
-    ['dokka.jar', 'dokka-ant.jar'].each {
-        from (zipTree(project.file("../out/$it"))) {
-            exclude 'META-INF/MANIFEST.MF'
-            exclude 'META-INF/*.SF'
-            exclude 'META-INF/*.DSA'
-            exclude 'META-INF/*.RSA'
-            exclude '**/*.kt'
-            exclude '**/*.java'
-            exclude '**/*.md'
-        }
-    }
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            artifact sourceJar {
-                classifier "sources"
-            }
-        }
-    }
-}
-
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-
-    pkg {
-        repo = 'dokka'
-        name = 'dokka'
-        userOrg = 'kotlin'
-        desc = 'Dokka, the Kotlin documentation tool'
-        vcsUrl = 'https://github.com/kotlin/dokka.git'
-        licenses = ['Apache-2.0']
-        version {
-            name = dokka_version
-        }
-    }
-
-    publications = ['maven']
-}
diff --git a/dokka-fatjar/dokka-fatjar.iml b/dokka-fatjar/dokka-fatjar.iml
deleted file mode 100644
index 3efbbe78..00000000
--- a/dokka-fatjar/dokka-fatjar.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":dokka-fatjar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.jetbrains.dokka" external.system.module.version="0.9" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/dokka-fatjar/settings.gradle b/dokka-fatjar/settings.gradle
deleted file mode 100644
index b8f66260..00000000
--- a/dokka-fatjar/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'dokka-fatjar'
-
diff --git a/dokka-gradle-plugin/build.gradle b/dokka-gradle-plugin/build.gradle
index 53e24bef..0ac1c659 100644
--- a/dokka-gradle-plugin/build.gradle
+++ b/dokka-gradle-plugin/build.gradle
@@ -30,7 +30,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile project(':dokka-fatjar')
+    compile project(':core')
 
     compile gradleApi()
     compile localGroovy()
diff --git a/dokka-gradle-plugin/dokka-gradle-plugin.iml b/dokka-gradle-plugin/dokka-gradle-plugin.iml
index 9002048b..90500970 100644
--- a/dokka-gradle-plugin/dokka-gradle-plugin.iml
+++ b/dokka-gradle-plugin/dokka-gradle-plugin.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":dokka-gradle-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.jetbrains.dokka" external.system.module.version="0.9" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":dokka-gradle-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.jetbrains.dokka" external.system.module.version="0.9.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
@@ -16,22 +16,100 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="dokka-fatjar" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="Gradle: com.google.inject:guice:4.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.spullara.cli-parser:cli-parser:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" />
+    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="module-library">
+      <library name="Gradle: trove4j">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/trove4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: jdom">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/jdom.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: protobuf-2.5.0-lite">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/protobuf-2.5.0-lite.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: asm-all">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/asm-all.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: intellij-core-analysis">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/intellij-core-analysis.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: kotlin-for-upsource">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/kotlin-for-upsource.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: markdown">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/markdown.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: picocontainer">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/picocontainer.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-core-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-core-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-core-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/core" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: groovy-all-2.3.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/groovy-all-2.3.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/groovy-all-2.3.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -40,7 +118,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: asm-all-5.0.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/asm-all-5.0.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/asm-all-5.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -49,7 +127,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: ant-1.9.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/ant-1.9.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/ant-1.9.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -58,7 +136,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: commons-collections-3.2.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-collections-3.2.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/commons-collections-3.2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -67,7 +145,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: commons-io-1.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-io-1.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/commons-io-1.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -76,7 +154,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: commons-lang-2.6">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-lang-2.6.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/commons-lang-2.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -85,7 +163,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: guava-jdk5-17.0">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/guava-jdk5-17.0.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/guava-jdk5-17.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -94,7 +172,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jcip-annotations-1.0">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jcip-annotations-1.0.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jcip-annotations-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -103,7 +181,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jul-to-slf4j-1.7.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jul-to-slf4j-1.7.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jul-to-slf4j-1.7.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -112,7 +190,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jarjar-1.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jarjar-1.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jarjar-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -121,7 +199,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: javax.inject-1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/javax.inject-1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/javax.inject-1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -130,7 +208,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: slf4j-api-1.7.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/slf4j-api-1.7.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/slf4j-api-1.7.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -139,7 +217,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: log4j-over-slf4j-1.7.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/log4j-over-slf4j-1.7.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/log4j-over-slf4j-1.7.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -148,7 +226,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jcl-over-slf4j-1.7.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jcl-over-slf4j-1.7.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jcl-over-slf4j-1.7.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -157,7 +235,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: ant-launcher-1.9.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/ant-launcher-1.9.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/ant-launcher-1.9.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -166,7 +244,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-docs-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-docs-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-docs-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -175,73 +253,61 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-model-core-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-model-core-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-model-core-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/model-core" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-base-services-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-base-services-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-base-services-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/base-services" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-base-services-groovy-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-base-services-groovy-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-base-services-groovy-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/base-services-groovy" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-model-groovy-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-model-groovy-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-model-groovy-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/model-groovy" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-cli-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-cli-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-cli-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/cli" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-native-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-native-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-native-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/native" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: jna-3.2.7">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jna-3.2.7.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jna-3.2.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -250,7 +316,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -259,7 +325,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jansi-1.2.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jansi-1.2.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/jansi-1.2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -268,7 +334,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-osx-i386-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-osx-i386-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-osx-i386-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -277,7 +343,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-osx-amd64-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-osx-amd64-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-osx-amd64-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -286,7 +352,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-linux-amd64-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-linux-amd64-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-linux-amd64-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -295,7 +361,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-linux-i386-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-linux-i386-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-linux-i386-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -304,7 +370,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-windows-amd64-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-windows-amd64-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-windows-amd64-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -313,7 +379,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-windows-i386-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-windows-i386-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-windows-i386-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -322,7 +388,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-freebsd-i386-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-freebsd-i386-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-freebsd-i386-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -331,7 +397,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: native-platform-freebsd-amd64-0.10">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-freebsd-amd64-0.10.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/native-platform-freebsd-amd64-0.10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -340,18 +406,16 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-messaging-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-messaging-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-messaging-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/messaging" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: kryo-2.20">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/kryo-2.20.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/kryo-2.20.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -360,7 +424,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: reflectasm-1.07-shaded">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/reflectasm-1.07-shaded.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/reflectasm-1.07-shaded.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -369,7 +433,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: minlog-1.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/minlog-1.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/minlog-1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -378,7 +442,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: objenesis-1.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/objenesis-1.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/objenesis-1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -387,29 +451,25 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-resources-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-resources-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-resources-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-dependency-management-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-dependency-management-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-dependency-management-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/dependency-management" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: ivy-2.2.0">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/ivy-2.2.0.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/ivy-2.2.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -418,7 +478,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: gson-2.2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gson-2.2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gson-2.2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -427,7 +487,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-core-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-core-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-core-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -436,7 +496,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: xbean-reflect-3.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xbean-reflect-3.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/xbean-reflect-3.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -445,7 +505,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: bcprov-jdk15on-1.51">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bcprov-jdk15on-1.51.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/bcprov-jdk15on-1.51.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -454,7 +514,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jsch-0.1.51">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsch-0.1.51.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jsch-0.1.51.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -463,7 +523,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-sec-dispatcher-1.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-sec-dispatcher-1.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-sec-dispatcher-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -472,7 +532,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aether-impl-1.13.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-impl-1.13.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aether-impl-1.13.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -481,7 +541,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aether-util-1.13.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-util-1.13.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aether-util-1.13.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -490,7 +550,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aether-spi-1.13.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-spi-1.13.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aether-spi-1.13.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -499,7 +559,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: wagon-provider-api-2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-provider-api-2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/wagon-provider-api-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -508,7 +568,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-aether-provider-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-aether-provider-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-aether-provider-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -517,7 +577,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-repository-metadata-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-repository-metadata-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-repository-metadata-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -526,7 +586,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-classworlds-2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-classworlds-2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-classworlds-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -535,7 +595,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aether-connector-wagon-1.13.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-connector-wagon-1.13.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aether-connector-wagon-1.13.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -544,7 +604,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-model-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-model-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-model-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -553,7 +613,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: wagon-http-2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-http-2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/wagon-http-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -562,7 +622,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-settings-builder-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-settings-builder-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-settings-builder-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -571,7 +631,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-compat-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-compat-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-compat-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -580,7 +640,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-component-annotations-1.5.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-component-annotations-1.5.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-component-annotations-1.5.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -589,7 +649,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-plugin-api-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-plugin-api-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-plugin-api-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -598,7 +658,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-container-default-1.5.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-container-default-1.5.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-container-default-1.5.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -607,7 +667,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-artifact-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-artifact-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-artifact-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -616,7 +676,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-interpolation-1.14">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-interpolation-1.14.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-interpolation-1.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -625,7 +685,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-settings-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-settings-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-settings-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -634,7 +694,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aether-api-1.13.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-api-1.13.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aether-api-1.13.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -643,7 +703,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-cipher-1.7">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-cipher-1.7.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-cipher-1.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -652,7 +712,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: wagon-file-2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-file-2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/wagon-file-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -661,7 +721,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: maven-model-builder-3.0.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-model-builder-3.0.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/maven-model-builder-3.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -670,7 +730,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: plexus-utils-2.0.6">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-utils-2.0.6.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/plexus-utils-2.0.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -679,7 +739,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: wagon-http-shared4-2.4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-http-shared4-2.4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/wagon-http-shared4-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -688,29 +748,25 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-plugin-use-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugin-use-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-plugin-use-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugin-use" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-resources-http-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-http-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-resources-http-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-http" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: httpclient-4.2.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/httpclient-4.2.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/httpclient-4.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -719,7 +775,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: nekohtml-1.9.14">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/nekohtml-1.9.14.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/nekohtml-1.9.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -728,7 +784,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: commons-codec-1.6">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/commons-codec-1.6.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/commons-codec-1.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -737,7 +793,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: httpcore-4.2.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/httpcore-4.2.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/httpcore-4.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -746,7 +802,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jcifs-1.3.17">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jcifs-1.3.17.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jcifs-1.3.17.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -755,7 +811,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: xml-apis-1.3.04">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xml-apis-1.3.04.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/xml-apis-1.3.04.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -764,7 +820,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: xercesImpl-2.9.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xercesImpl-2.9.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/xercesImpl-2.9.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -773,40 +829,34 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-tooling-api-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-tooling-api-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-tooling-api-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/tooling-api" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-wrapper-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-wrapper-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/gradle-wrapper-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/wrapper" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-plugins-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugins-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-plugins-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugins" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: junit-4.12">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/junit-4.12.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/junit-4.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -815,7 +865,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: testng-6.3.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/testng-6.3.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/testng-6.3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -824,7 +874,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: commons-cli-1.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/commons-cli-1.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/commons-cli-1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -833,7 +883,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: bsh-2.0b4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bsh-2.0b4.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/bsh-2.0b4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -842,7 +892,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jcommander-1.12">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jcommander-1.12.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jcommander-1.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -851,7 +901,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: snakeyaml-1.6">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/snakeyaml-1.6.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/snakeyaml-1.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -860,7 +910,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: hamcrest-core-1.3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -869,29 +919,25 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-code-quality-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-code-quality-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-code-quality-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/code-quality" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-jetty-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-jetty-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-jetty-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/jetty" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: jetty-6.1.25">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-6.1.25.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jetty-6.1.25.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -900,7 +946,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jetty-util-6.1.25">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-util-6.1.25.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jetty-util-6.1.25.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -909,7 +955,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: servlet-api-2.5-20081211">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/servlet-api-2.5-20081211.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/servlet-api-2.5-20081211.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -918,7 +964,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jetty-plus-6.1.25">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-plus-6.1.25.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jetty-plus-6.1.25.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -927,7 +973,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jsp-2.1-6.1.14">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsp-2.1-6.1.14.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jsp-2.1-6.1.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -936,7 +982,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jetty-annotations-6.1.25">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-annotations-6.1.25.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jetty-annotations-6.1.25.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -945,7 +991,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: geronimo-annotation_1.0_spec-1.0">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -954,7 +1000,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jetty-naming-6.1.25">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-naming-6.1.25.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jetty-naming-6.1.25.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -963,7 +1009,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: core-3.1.1">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/core-3.1.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/core-3.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -972,7 +1018,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jsp-api-2.1-6.1.14">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsp-api-2.1-6.1.14.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jsp-api-2.1-6.1.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -981,29 +1027,25 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-antlr-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-antlr-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-antlr-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/antlr" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-osgi-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-osgi-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-osgi-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/osgi" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: bndlib-2.1.0">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bndlib-2.1.0.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/bndlib-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1012,18 +1054,16 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-maven-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-maven-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-maven-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/maven" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: pmaven-common-0.8-20100325">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/pmaven-common-0.8-20100325.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/pmaven-common-0.8-20100325.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1032,7 +1072,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: pmaven-groovy-0.8-20100325">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/pmaven-groovy-0.8-20100325.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/pmaven-groovy-0.8-20100325.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1041,51 +1081,43 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-ide-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ide-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-ide-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ide" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-announce-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-announce-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-announce-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/announce" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-scala-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-scala-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-scala-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/scala" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-sonar-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-sonar-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-sonar-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/sonar" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: sonar-batch-bootstrapper-2.9">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/sonar-batch-bootstrapper-2.9.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/sonar-batch-bootstrapper-2.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1094,18 +1126,16 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-signing-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-signing-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-signing-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/signing" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: bcpg-jdk15on-1.51">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bcpg-jdk15on-1.51.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/bcpg-jdk15on-1.51.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1114,29 +1144,25 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-ear-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ear-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-ear-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ear" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-javascript-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-javascript-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-javascript-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/javascript" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: rhino-1.7R3">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/rhino-1.7R3.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/rhino-1.7R3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1145,7 +1171,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: simple-4.1.21">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/simple-4.1.21.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/simple-4.1.21.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1154,40 +1180,34 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-build-comparison-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-build-comparison-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-build-comparison-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/build-comparison" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-diagnostics-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-diagnostics-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-diagnostics-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/diagnostics" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-reporting-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-reporting-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-reporting-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/reporting" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: jatl-0.2.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jatl-0.2.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jatl-0.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1196,205 +1216,169 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-publish-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-publish-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-publish-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/publish" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-ivy-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ivy-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-ivy-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ivy" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-jacoco-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-jacoco-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-jacoco-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/jacoco" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-build-init-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-build-init-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-build-init-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/build-init" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-platform-base-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-base-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-platform-base-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-base" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-platform-jvm-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-jvm-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-platform-jvm-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-jvm" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-language-jvm-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-jvm-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-language-jvm-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-jvm" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-language-java-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-java-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-language-java-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-java" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-language-groovy-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-groovy-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-language-groovy-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-groovy" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-language-scala-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-scala-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-language-scala-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-scala" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-platform-native-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-native-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-platform-native-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-native" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-platform-play-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-play-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-platform-play-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-play" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-language-native-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-native-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-language-native-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-native" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-ide-native-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ide-native-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-ide-native-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ide-native" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-testing-native-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-testing-native-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-testing-native-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/testing-native" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-plugin-development-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugin-development-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-plugin-development-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugin-development" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-resources-sftp-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-sftp-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-resources-sftp-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-sftp" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-resources-s3-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-s3-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-resources-s3-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-s3" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: aws-java-sdk-s3-1.9.19">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-s3-1.9.19.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aws-java-sdk-s3-1.9.19.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1403,7 +1387,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aws-java-sdk-kms-1.9.19">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-kms-1.9.19.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aws-java-sdk-kms-1.9.19.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1412,7 +1396,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: aws-java-sdk-core-1.9.19">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-core-1.9.19.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/aws-java-sdk-core-1.9.19.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1421,7 +1405,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jackson-core-2.3.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-core-2.3.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jackson-core-2.3.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1430,7 +1414,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jackson-annotations-2.3.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-annotations-2.3.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jackson-annotations-2.3.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1439,7 +1423,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: jackson-databind-2.3.2">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-databind-2.3.2.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/jackson-databind-2.3.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1448,7 +1432,7 @@
     <orderEntry type="module-library">
       <library name="Gradle: joda-time-2.7">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/joda-time-2.7.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/joda-time-2.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -1457,15 +1441,11 @@
     <orderEntry type="module-library">
       <library name="Gradle: gradle-tooling-api-builders-2.5">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-tooling-api-builders-2.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-bin/7mk8vyobxfh3eazpg3pi2y9mv/gradle-2.5/lib/plugins/gradle-tooling-api-builders-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/tooling-api-builders" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/dokka.iml b/dokka.iml
index 08f86168..72bb64a3 100644
--- a/dokka.iml
+++ b/dokka.iml
@@ -1,30 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+<module external.linked.project.id="dokka" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build" />
+    <output-test url="file://$MODULE_DIR$/build" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.dokka" />
-      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="true" packagePrefix="org.jetbrains.dokka.tests" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/doc" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core-analysis" level="project" />
-    <orderEntry type="library" name="junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="markdown" level="project" />
-    <orderEntry type="library" name="jsoup" level="project" />
-    <orderEntry type="library" exported="" name="kotlin-for-upsource" level="project" />
-    <orderEntry type="library" name="cli-parser" level="project" />
-    <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="library" name="picocontainer" level="project" />
-    <orderEntry type="library" name="trove4j" level="project" />
-    <orderEntry type="library" name="jdom" level="project" />
-    <orderEntry type="library" name="protobuf" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" name="jps-model" level="project" />
-    <orderEntry type="library" exported="" name="com.google.inject:guice:4.0" level="project" />
-    <orderEntry type="library" name="jansi" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/dokka-fatjar/dokka.pro b/dokka.pro
index 97eae693..97eae693 100644
--- a/dokka-fatjar/dokka.pro
+++ b/dokka.pro
diff --git a/gradle.properties b/gradle.properties
index a8da9ec9..1a3d81e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-kotlin_version=1.0.0-beta-2423
+kotlin_version=1.0.0-beta-3593
 dokka_version=0.9.2
diff --git a/javadoc/build.gradle b/javadoc/build.gradle
deleted file mode 100644
index ac079b99..00000000
--- a/javadoc/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-group 'org.jetbrains.dokka'
-version '0.0.1-SNAPSHOT'
-
-buildscript {
-    ext.kotlin_version = '0.1-SNAPSHOT'
-    repositories {
-        mavenCentral()
-        maven {
-            url 'http://oss.sonatype.org/content/repositories/snapshots'
-        }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'maven-publish'
-
-
-sourceCompatibility = 1.5
-
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven {
-        url 'http://oss.sonatype.org/content/repositories/snapshots'
-    }
-}
-
-dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.dokka:dokka-fatjar:(1.0,1.1)"
-    compile files("${System.properties['java.home']}/../lib/tools.jar")
-
-    compile gradleApi()
-    compile localGroovy()
-}
-
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-}
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-}
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.5'
-    distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
-}
diff --git a/javadoc/gradle/wrapper/gradle-wrapper.jar b/javadoc/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 30d399d8..00000000
--- a/javadoc/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
diff --git a/javadoc/gradle/wrapper/gradle-wrapper.properties b/javadoc/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index a9e95352..00000000
--- a/javadoc/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Fri Jul 24 15:47:38 MSK 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/javadoc/javadoc.iml b/javadoc/javadoc.iml
deleted file mode 100644
index 76ed06d4..00000000
--- a/javadoc/javadoc.iml
+++ /dev/null
@@ -1,1481 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT" level="project" />
-    <orderEntry type="module-library">
-      <library name="Gradle: tools">
-        <CLASSES>
-          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home/lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-core-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-core-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/core" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: groovy-all-2.3.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/groovy-all-2.3.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: asm-all-5.0.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/asm-all-5.0.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: ant-1.9.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/ant-1.9.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: commons-collections-3.2.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-collections-3.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: commons-io-1.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-io-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: commons-lang-2.6">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/commons-lang-2.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: guava-jdk5-17.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/guava-jdk5-17.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jcip-annotations-1.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jcip-annotations-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jul-to-slf4j-1.7.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jul-to-slf4j-1.7.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jarjar-1.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jarjar-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: javax.inject-1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/javax.inject-1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: slf4j-api-1.7.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/slf4j-api-1.7.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: log4j-over-slf4j-1.7.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/log4j-over-slf4j-1.7.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jcl-over-slf4j-1.7.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jcl-over-slf4j-1.7.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: ant-launcher-1.9.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/ant-launcher-1.9.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-docs-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-docs-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-model-core-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-model-core-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/model-core" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-base-services-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-base-services-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/base-services" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-base-services-groovy-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-base-services-groovy-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/base-services-groovy" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-model-groovy-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-model-groovy-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/model-groovy" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-cli-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-cli-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/cli" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-native-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-native-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/native" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jna-3.2.7">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jna-3.2.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jansi-1.2.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/jansi-1.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-osx-i386-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-osx-i386-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-osx-amd64-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-osx-amd64-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-linux-amd64-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-linux-amd64-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-linux-i386-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-linux-i386-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-windows-amd64-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-windows-amd64-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-windows-i386-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-windows-i386-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-freebsd-i386-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-freebsd-i386-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: native-platform-freebsd-amd64-0.10">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/native-platform-freebsd-amd64-0.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-messaging-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-messaging-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/messaging" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: kryo-2.20">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/kryo-2.20.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: reflectasm-1.07-shaded">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/reflectasm-1.07-shaded.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: minlog-1.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/minlog-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: objenesis-1.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/objenesis-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-resources-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-resources-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-dependency-management-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-dependency-management-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/dependency-management" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: ivy-2.2.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/ivy-2.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gson-2.2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gson-2.2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-core-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-core-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: xbean-reflect-3.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xbean-reflect-3.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: bcprov-jdk15on-1.51">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bcprov-jdk15on-1.51.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jsch-0.1.51">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsch-0.1.51.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-sec-dispatcher-1.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-sec-dispatcher-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aether-impl-1.13.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-impl-1.13.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aether-util-1.13.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-util-1.13.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aether-spi-1.13.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-spi-1.13.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: wagon-provider-api-2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-provider-api-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-aether-provider-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-aether-provider-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-repository-metadata-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-repository-metadata-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-classworlds-2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-classworlds-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aether-connector-wagon-1.13.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-connector-wagon-1.13.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-model-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-model-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: wagon-http-2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-http-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-settings-builder-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-settings-builder-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-compat-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-compat-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-component-annotations-1.5.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-component-annotations-1.5.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-plugin-api-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-plugin-api-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-container-default-1.5.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-container-default-1.5.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-artifact-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-artifact-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-interpolation-1.14">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-interpolation-1.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-settings-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-settings-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aether-api-1.13.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aether-api-1.13.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-cipher-1.7">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-cipher-1.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: wagon-file-2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-file-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: maven-model-builder-3.0.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/maven-model-builder-3.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: plexus-utils-2.0.6">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/plexus-utils-2.0.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: wagon-http-shared4-2.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/wagon-http-shared4-2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-plugin-use-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugin-use-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugin-use" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-resources-http-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-http-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-http" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: httpclient-4.2.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/httpclient-4.2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: nekohtml-1.9.14">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/nekohtml-1.9.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: commons-codec-1.6">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/commons-codec-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: httpcore-4.2.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/httpcore-4.2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jcifs-1.3.17">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jcifs-1.3.17.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: xml-apis-1.3.04">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xml-apis-1.3.04.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: xercesImpl-2.9.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/xercesImpl-2.9.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-tooling-api-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-tooling-api-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/tooling-api" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-wrapper-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/gradle-wrapper-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/wrapper" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-plugins-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugins-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugins" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: junit-4.12">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/junit-4.12.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: testng-6.3.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/testng-6.3.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: commons-cli-1.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/commons-cli-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: bsh-2.0b4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bsh-2.0b4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jcommander-1.12">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jcommander-1.12.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: snakeyaml-1.6">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/snakeyaml-1.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: hamcrest-core-1.3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/hamcrest-core-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-code-quality-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-code-quality-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/code-quality" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-jetty-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-jetty-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/jetty" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jetty-6.1.25">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-6.1.25.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jetty-util-6.1.25">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-util-6.1.25.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: servlet-api-2.5-20081211">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/servlet-api-2.5-20081211.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jetty-plus-6.1.25">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-plus-6.1.25.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jsp-2.1-6.1.14">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsp-2.1-6.1.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jetty-annotations-6.1.25">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-annotations-6.1.25.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: geronimo-annotation_1.0_spec-1.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jetty-naming-6.1.25">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jetty-naming-6.1.25.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: core-3.1.1">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/core-3.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jsp-api-2.1-6.1.14">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jsp-api-2.1-6.1.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-antlr-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-antlr-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/antlr" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-osgi-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-osgi-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/osgi" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: bndlib-2.1.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bndlib-2.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-maven-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-maven-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/maven" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: pmaven-common-0.8-20100325">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/pmaven-common-0.8-20100325.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: pmaven-groovy-0.8-20100325">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/pmaven-groovy-0.8-20100325.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-ide-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ide-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ide" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-announce-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-announce-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/announce" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-scala-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-scala-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/scala" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-sonar-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-sonar-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/sonar" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: sonar-batch-bootstrapper-2.9">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/sonar-batch-bootstrapper-2.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-signing-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-signing-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/signing" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: bcpg-jdk15on-1.51">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/bcpg-jdk15on-1.51.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-ear-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ear-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ear" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-javascript-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-javascript-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/javascript" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: rhino-1.7R3">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/rhino-1.7R3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: simple-4.1.21">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/simple-4.1.21.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-build-comparison-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-build-comparison-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/build-comparison" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-diagnostics-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-diagnostics-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/diagnostics" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-reporting-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-reporting-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/reporting" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jatl-0.2.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jatl-0.2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-publish-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-publish-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/publish" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-ivy-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ivy-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ivy" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-jacoco-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-jacoco-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/jacoco" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-build-init-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-build-init-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/build-init" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-platform-base-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-base-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-base" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-platform-jvm-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-jvm-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-jvm" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-language-jvm-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-jvm-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-jvm" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-language-java-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-java-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-java" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-language-groovy-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-groovy-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-groovy" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-language-scala-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-scala-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-scala" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-platform-native-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-native-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-native" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-platform-play-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-platform-play-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/platform-play" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-language-native-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-language-native-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/language-native" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-ide-native-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-ide-native-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/ide-native" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-testing-native-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-testing-native-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/testing-native" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-plugin-development-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-plugin-development-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/plugin-development" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-resources-sftp-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-sftp-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-sftp" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-resources-s3-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-resources-s3-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/resources-s3" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aws-java-sdk-s3-1.9.19">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-s3-1.9.19.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aws-java-sdk-kms-1.9.19">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-kms-1.9.19.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: aws-java-sdk-core-1.9.19">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/aws-java-sdk-core-1.9.19.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jackson-core-2.3.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-core-2.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jackson-annotations-2.3.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-annotations-2.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: jackson-databind-2.3.2">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/jackson-databind-2.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: joda-time-2.7">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/joda-time-2.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: gradle-tooling-api-builders-2.5">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/lib/plugins/gradle-tooling-api-builders-2.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.5-all/d3xh0kipe7wr2bvnx5sk0hao8/gradle-2.5/src/tooling-api-builders" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/javadoc/settings.gradle b/javadoc/settings.gradle
deleted file mode 100644
index 30b72384..00000000
--- a/javadoc/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'javadoc'
-
diff --git a/lib/ant-1.9.4.jar b/lib/ant-1.9.4.jar
deleted file mode 100644
index 24641e74..00000000
--- a/lib/ant-1.9.4.jar
+++ /dev/null
diff --git a/lib/aopalliance-1.0.jar b/lib/aopalliance-1.0.jar
deleted file mode 100644
index 578b1a0c..00000000
--- a/lib/aopalliance-1.0.jar
+++ /dev/null
diff --git a/lib/cli-parser-1.1.1.jar b/lib/cli-parser-1.1.1.jar
deleted file mode 100644
index bbad801d..00000000
--- a/lib/cli-parser-1.1.1.jar
+++ /dev/null
diff --git a/lib/guava-17.0.jar b/lib/guava-17.0.jar
deleted file mode 100644
index 661fc747..00000000
--- a/lib/guava-17.0.jar
+++ /dev/null
diff --git a/lib/guice-4.0.jar b/lib/guice-4.0.jar
deleted file mode 100644
index f4fc9ffd..00000000
--- a/lib/guice-4.0.jar
+++ /dev/null
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e..00000000
--- a/lib/hamcrest-core-1.3.jar
+++ /dev/null
diff --git a/lib/jansi.jar b/lib/jansi.jar
deleted file mode 100644
index 63284fd7..00000000
--- a/lib/jansi.jar
+++ /dev/null
diff --git a/lib/jsoup-1.8.1-sources.jar b/lib/jsoup-1.8.1-sources.jar
deleted file mode 100644
index 3b7aea4a..00000000
--- a/lib/jsoup-1.8.1-sources.jar
+++ /dev/null
diff --git a/lib/jsoup-1.8.1.jar b/lib/jsoup-1.8.1.jar
deleted file mode 100644
index ae717d45..00000000
--- a/lib/jsoup-1.8.1.jar
+++ /dev/null
diff --git a/lib/junit-4.11-javadoc.jar b/lib/junit-4.11-javadoc.jar
deleted file mode 100644
index 6986173c..00000000
--- a/lib/junit-4.11-javadoc.jar
+++ /dev/null
diff --git a/lib/junit-4.11-sources.jar b/lib/junit-4.11-sources.jar
deleted file mode 100644
index bab4cddb..00000000
--- a/lib/junit-4.11-sources.jar
+++ /dev/null
diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar
deleted file mode 100644
index aaf74448..00000000
--- a/lib/junit-4.11.jar
+++ /dev/null
diff --git a/lib/maven-ant-tasks-2.1.3.jar b/lib/maven-ant-tasks-2.1.3.jar
deleted file mode 100644
index bec446ff..00000000
--- a/lib/maven-ant-tasks-2.1.3.jar
+++ /dev/null
diff --git a/maven-plugin/dokka-maven-plugin.iml b/maven-plugin/dokka-maven-plugin.iml
index 984991e8..1c05c571 100644
--- a/maven-plugin/dokka-maven-plugin.iml
+++ b/maven-plugin/dokka-maven-plugin.iml
@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/plugin" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/lib" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 3dc57f54..5bb4af2b 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -1,141 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.jetbrains.dokka</groupId>
-    <artifactId>dokka-maven-plugin</artifactId>
-    <version>1.0.0-beta-1038</version>
-    <packaging>maven-plugin</packaging>
-
-    <properties>
-        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
-        <maven.version>3.0.5</maven.version>
-        <plexus.version>3.0.22</plexus.version>
-        <kotlinVersion>1.0.0-beta-1038</kotlinVersion>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-            <version>${maven.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>${maven.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>${maven.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>${plexus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains.dokka</groupId>
-            <artifactId>dokka-fatjar</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src/main/kotlin</sourceDirectory>
-
-        <plugins>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlinVersion}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.4</version>
-
-                <executions>
-                    <execution>
-                        <id>default-descriptor</id>
-                        <goals>
-                            <goal>descriptor</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                    <execution>
-                        <id>help-descriptor</id>
-                        <goals>
-                            <goal>helpmojo</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <goalPrefix>dokka</goalPrefix>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
-
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>sonatype.oss.snapshots</id>
-            <name>Sonatype OSS Snapshot Repository</name>
-            <url>http://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jetbrains.dokka</groupId>
+  <artifactId>dokka-maven-plugin</artifactId>
+  <version>0.9.2</version>
+  <packaging>maven-plugin</packaging>
+  <properties>
+    <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
+    <maven.version>3.0.5</maven.version>
+    <plexus.version>3.0.22</plexus.version>
+    <kotlinVersion>1.0.0-beta-2423</kotlinVersion>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>${plexus.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.dokka</groupId>
+      <artifactId>dokka-fatjar</artifactId>
+      <version>${version}</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src/main/kotlin</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <version>${kotlinVersion}</version>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.4</version>
+        <executions>
+          <execution>
+            <id>default-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+            <phase>process-classes</phase>
+          </execution>
+          <execution>
+            <id>help-descriptor</id>
+            <goals>
+              <goal>helpmojo</goal>
+            </goals>
+            <phase>process-classes</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <goalPrefix>dokka</goalPrefix>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.6</version>
+      </plugin>
+    </plugins>
+  </build>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype.oss.snapshots</id>
+      <name>Sonatype OSS Snapshot Repository</name>
+      <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
 </project>
diff --git a/settings.gradle b/settings.gradle
index c92cba5f..f02d412e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'dokka-fatjar', 'dokka-gradle-plugin'
+include 'core', 'dokka-gradle-plugin'