diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 010f71c..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'maven'
-
-group = 'app.shosetsu.lib'
-version = '1.0.0'
-
-description = "Kotlin library for shosetsu"
-
-sourceCompatibility = 8
-targetCompatibility = 8
-
-repositories {
-     maven { url "https://repo.maven.apache.org/maven2" }
-}
-
-dependencies {
-    compile group: 'com.squareup.okhttp3', name: 'okhttp', version:'4.2.1'
-    compile group: 'org.jsoup', name: 'jsoup', version:'1.12.1'
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version:'1.3.61'
-    compile group: 'org.luaj', name: 'luaj-jse', version:'3.0.1'
-    compile group: 'org.json', name: 'json', version:'20190722'
-    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test', version:'1.3.61'
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..ca38b5b
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,38 @@
+import org.gradle.jvm.tasks.Jar
+
+group = "app.shosetsu.lib"
+version = "1.0.0"
+description = "Kotlin library for shosetsu"
+
+plugins {
+    kotlin("jvm") version "1.3.61"
+	id("org.jetbrains.dokka") version "0.10.0"
+}
+
+tasks.dokka {
+	outputFormat = "html"
+	outputDirectory = "$buildDir/javadoc"
+}
+
+val dokkaJar by tasks.creating(Jar::class) {
+	group = JavaBasePlugin.DOCUMENTATION_GROUP
+	description = "Assembles Kotlin docs with Dokka"
+	classifier = "javadoc"
+}
+
+repositories {
+    jcenter()
+	mavenCentral()
+}
+
+dependencies {
+    implementation(kotlin("stdlib"))
+    implementation("org.jsoup:jsoup:1.12.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61")
+	implementation("org.luaj:luaj-jse:3.0.1")
+    implementation("org.json:json:20190722")
+	implementation( "com.squareup.okhttp3:okhttp:4.2.1")
+	testImplementation("junit:junit:4.12")
+//	implementation("org.jetbrains.kolin:kotlin-test:v1.3.61")
+}
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9978da..9559f58 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 7ec084d..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'shosetsu-kotlin-lib'
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..9637e07
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "shosetsu-kotlin-lib"
\ No newline at end of file
diff --git a/src/main/java/app/shosetsu/lib/Filter.kt b/src/main/kotlin/app/shosetsu/lib/Filter.kt
similarity index 100%
rename from src/main/java/app/shosetsu/lib/Filter.kt
rename to src/main/kotlin/app/shosetsu/lib/Filter.kt
diff --git a/src/main/java/app/shosetsu/lib/Formatter.kt b/src/main/kotlin/app/shosetsu/lib/Formatter.kt
similarity index 100%
rename from src/main/java/app/shosetsu/lib/Formatter.kt
rename to src/main/kotlin/app/shosetsu/lib/Formatter.kt
diff --git a/src/main/java/app/shosetsu/lib/LuaFormatter.kt b/src/main/kotlin/app/shosetsu/lib/LuaFormatter.kt
similarity index 100%
rename from src/main/java/app/shosetsu/lib/LuaFormatter.kt
rename to src/main/kotlin/app/shosetsu/lib/LuaFormatter.kt
diff --git a/src/main/java/app/shosetsu/lib/Novel.kt b/src/main/kotlin/app/shosetsu/lib/Novel.kt
similarity index 100%
rename from src/main/java/app/shosetsu/lib/Novel.kt
rename to src/main/kotlin/app/shosetsu/lib/Novel.kt
diff --git a/src/main/java/app/shosetsu/lib/ShosetsuLib.kt b/src/main/kotlin/app/shosetsu/lib/ShosetsuLib.kt
similarity index 100%
rename from src/main/java/app/shosetsu/lib/ShosetsuLib.kt
rename to src/main/kotlin/app/shosetsu/lib/ShosetsuLib.kt
diff --git a/src/main/java/app/shosetsu/lib/Test.kt b/src/test/kotlin/app/shosetsu/lib/Test.kt
similarity index 91%
rename from src/main/java/app/shosetsu/lib/Test.kt
rename to src/test/kotlin/app/shosetsu/lib/Test.kt
index 893400c..34be9c3 100644
--- a/src/main/java/app/shosetsu/lib/Test.kt
+++ b/src/test/kotlin/app/shosetsu/lib/Test.kt
@@ -1,6 +1,7 @@
 package app.shosetsu.lib
 
 import okhttp3.OkHttpClient
+import org.junit.Test
 import org.luaj.vm2.LuaValue
 import org.luaj.vm2.lib.jse.JsePlatform
 import java.io.File
@@ -28,14 +29,17 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
  *
  * In IDEA, The Classpath should be shosetsu-services but the Working directory should be shosetsu-extensions.
  */
-private object Test {
-	// CONFIG
-	private const val SEARCH_VALUE = "world"
-	private const val PRINT_LISTINGS = false
-	private const val PRINT_LIST_STATS = true
-	private const val PRINT_NOVELS = false
-	private const val PRINT_NOVEL_STATS = true
-	private const val PRINT_PASSAGES = false
+class Test {
+	companion object{
+		// CONFIG
+		private const val SEARCH_VALUE = "world"
+		private const val PRINT_LISTINGS = false
+		private const val PRINT_LIST_STATS = true
+		private const val PRINT_NOVELS = false
+		private const val PRINT_NOVEL_STATS = true
+		private const val PRINT_PASSAGES = false
+	}
+
 
 	private val SOURCES = arrayOf(
 			"en/MTLNovel"
@@ -84,8 +88,8 @@ private object Test {
 	}
 
 	@Throws(java.io.IOException::class, InterruptedException::class)
-	@JvmStatic
-	fun main(args: Array<String>) {
+	@Test
+	fun main() {
 		try {
 			ShosetsuLib.libLoader = { loadScript(File("src/main/resources/lib/$it.lua")) }
 			ShosetsuLib.httpClient = OkHttpClient()