diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af9b7a546..cd8cc9302 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: 1.8
       
       - name: Build Terra
-        run:  gradle shadowJar
+        run: ./gradlew build -x test && ./gradlew build -x test
       
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -34,7 +34,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           prerelease: false
-          files:      |
-                      build/libs/Terra-*.jar
-                      LICENSE
+          files: |
+                      build/libs/Terra-*-shaded.jar
                       
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 973dd071c..e52e0b2e5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -96,10 +96,32 @@ tasks.test {
     maxParallelForks = 12
 }
 
+val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
+    doFirst {
+        file("${buildDir}/resources/main/packs/").deleteRecursively()
+
+        val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip")
+        downloadAndUnzipPack(defaultPackUrl)
+        val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip")
+        downloadAndUnzipPack(netherPackUrl)
+    }
+
+    file("${buildDir}/resources/main/packs/").deleteRecursively()
+
+    val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip")
+    downloadAndUnzipPack(defaultPackUrl)
+    val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip")
+    downloadAndUnzipPack(netherPackUrl)
+}
+tasks.compileJava {
+    dependsOn(downloadDefaultPacks)
+}
+
 tasks.named<ShadowJar>("shadowJar") {
     from(tokenizeJavaSources.destinationDir)
+    dependsOn(downloadDefaultPacks)
 
-    archiveClassifier.set("")
+    archiveClassifier.set("shaded")
     archiveBaseName.set("Terra")
     setVersion(project.version)
     relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
@@ -107,13 +129,9 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("parsii", "com.dfsek.terra.lib.parsii")
     relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
     relocate("net.jafama", "com.dfsek.terra.lib.jafama")
-    minimize()
-}
-
-tasks.build {
-    dependsOn(tasks.shadowJar)
-//    dependsOn(testWithPaper)
-//    testWithPaper.mustRunAfter(tasks.shadowJar)
+    minimize {
+        exclude(project(":"))
+    }
 }
 
 val testDir = "target/server/"
@@ -152,21 +170,14 @@ val setupServer = tasks.create("setupServer") {
     }
 }
 
-val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
-    doFirst {
-        // Downloading latest paper jar.
-//        if (file("${buildDir}/resources/main/packs/default").exists() && file("${buildDir}/resources/main/packs/nether").exists())
-//            return@doFirst
-//        else
-        file("${buildDir}/resources/main/packs/").deleteRecursively()
-
-        val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip")
-        downloadAndUnzipPack(defaultPackUrl)
-        val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip")
-        downloadAndUnzipPack(netherPackUrl)
-    }
+tasks.build {
+    dependsOn(tasks.shadowJar)
+    dependsOn(downloadDefaultPacks)
+    tasks.shadowJar.get().mustRunAfter(downloadDefaultPacks)
+//    dependsOn(testWithPaper)
+//    testWithPaper.mustRunAfter(tasks.shadowJar)
 }
-tasks.processResources.get().dependsOn(downloadDefaultPacks)
+
 
 val testWithPaper = task<JavaExec>(name = "testWithPaper") {
     standardInput = System.`in`