diff --git a/BukkitPlugin/build.gradle b/BukkitPlugin/build.gradle
index 3861a5b..b9e240b 100644
--- a/BukkitPlugin/build.gradle
+++ b/BukkitPlugin/build.gradle
@@ -15,3 +15,5 @@ processResources {
         exclude 'plugin.yml'
     }
 }
+
+shadowJar.enabled = false
diff --git a/build.gradle b/build.gradle
index 8ebd103..153a000 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,18 @@ allprojects {
     group 'br.com.gamemods.kotlinfun'
     version '0.2-SNAPSHOT'
 
+    apply plugin: 'kotlin'
+
     repositories {
         mavenCentral()
         maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' }
         maven { url = 'https://hub.spigotmc.org/nexus/content/groups/public/' }
     }
+
+    dependencies {
+        compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+        testCompile group: 'junit', name: 'junit', version: '4.11'
+    }
 }
 
 buildscript {
@@ -23,16 +30,6 @@ buildscript {
     }
 }
 
-apply plugin: 'kotlin'
-
-dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}
-
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-}
-
 subprojects {
     apply plugin: 'kotlin'
     apply plugin: 'com.github.johnrengelman.shadow'
@@ -44,11 +41,7 @@ subprojects {
     }
 
     dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-        compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-        compile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
         compile rootProject
-        testCompile group: 'junit', name: 'junit', version: '4.11'
     }
 
     shadowJar {
@@ -60,15 +53,25 @@ subprojects {
         }
 
         classifier = null
+        baseName = rootProject.name+'-'+project.name
     }
 
     build.finalizedBy shadowJar
+
+    task copyFinalJar(type: Copy) {
+        from "${project.buildDir}/libs/${shadowJar.archiveName}"
+        into "${rootProject.buildDir}"
+    }
+
+    shadowJar.finalizedBy(copyFinalJar)
 }
 
 project(':BungeeChat') {
     dependencies {
         compile 'net.md-5:bungeecord-chat:1.10-SNAPSHOT'
     }
+
+    shadowJar.enabled = false
 }
 
 project(':UniversalPlugin') {
@@ -80,6 +83,7 @@ project(':UniversalPlugin') {
     shadowJar {
         dependencies {
             include project(':BungeePlugin')
+            include project(':BukkitPlugin')
             include project(':SpigotPlugin')
         }
     }