diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 310e0f2..3163861 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,6 +10,7 @@
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
+        <option name="useAutoImport" value="true" />
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
diff --git a/build.gradle b/build.gradle
index 20e829d..2011e42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,47 +1,50 @@
-plugins {
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+buildscript {
+    ext.kotlin_version = '1.3.21'
+    
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
+    }
 }
+
+apply plugin: 'kotlin'
+apply plugin: 'java'
+apply plugin: 'com.github.johnrengelman.shadow'
+
 group 'io.github.chronosx88'
 version '0.1'
 
-task fatJar(type: Jar) {
-    manifest {
-        attributes(
-                'Main-Class': 'io.github.chronosx88.dhtBootstrap.MainKt'
-        )
-    }
-    baseName = project.name + '-all'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}
-
-sourceCompatibility = 1.8
-
 repositories {
     mavenCentral()
-    /*maven {
-        url "http://tomp2p.net/dev/mvn/"
-    }*/
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs/tomp2p')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    //implementation 'net.tomp2p:tomp2p-all:5.0-Beta8'
     implementation 'org.slf4j:slf4j-log4j12:+'
 }
 
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
+
 compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
+
 jar {
     manifest {
-        attributes(
-                'Main-Class': 'io.github.chronosx88.dhtBootstrap.MainKt'
-        )
+        attributes 'Main-Class': 'MainKt'
+    }
+    from {
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
     }
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
\ No newline at end of file
diff --git a/src/libs/je-5.0.104.jar b/libs/je-5.0.104.jar
similarity index 100%
rename from src/libs/je-5.0.104.jar
rename to libs/je-5.0.104.jar
diff --git a/src/libs/lib/tomp2p-all-5.0-Beta8.jar b/libs/tomp2p-all-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-all-5.0-Beta8.jar
rename to libs/tomp2p-all-5.0-Beta8.jar
diff --git a/src/libs/lib/gcm-server-1.0.2.jar b/libs/tomp2p/gcm-server-1.0.2.jar
similarity index 100%
rename from src/libs/lib/gcm-server-1.0.2.jar
rename to libs/tomp2p/gcm-server-1.0.2.jar
diff --git a/src/libs/lib/json-simple-1.1.jar b/libs/tomp2p/json-simple-1.1.jar
similarity index 100%
rename from src/libs/lib/json-simple-1.1.jar
rename to libs/tomp2p/json-simple-1.1.jar
diff --git a/src/libs/lib/netty-buffer-4.0.28.Final.jar b/libs/tomp2p/netty-buffer-4.0.28.Final.jar
similarity index 100%
rename from src/libs/lib/netty-buffer-4.0.28.Final.jar
rename to libs/tomp2p/netty-buffer-4.0.28.Final.jar
diff --git a/src/libs/lib/netty-common-4.0.28.Final.jar b/libs/tomp2p/netty-common-4.0.28.Final.jar
similarity index 100%
rename from src/libs/lib/netty-common-4.0.28.Final.jar
rename to libs/tomp2p/netty-common-4.0.28.Final.jar
diff --git a/src/libs/lib/netty-transport-4.0.28.Final.jar b/libs/tomp2p/netty-transport-4.0.28.Final.jar
similarity index 100%
rename from src/libs/lib/netty-transport-4.0.28.Final.jar
rename to libs/tomp2p/netty-transport-4.0.28.Final.jar
diff --git a/src/libs/lib/slf4j-api-1.7.5.jar b/libs/tomp2p/slf4j-api-1.7.5.jar
similarity index 100%
rename from src/libs/lib/slf4j-api-1.7.5.jar
rename to libs/tomp2p/slf4j-api-1.7.5.jar
diff --git a/src/libs/tomp2p-all-5.0-Beta8.jar b/libs/tomp2p/tomp2p-all-5.0-Beta8.jar
similarity index 100%
rename from src/libs/tomp2p-all-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-all-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-android-5.0-Beta8.jar b/libs/tomp2p/tomp2p-android-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-android-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-android-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-core-5.0-Beta8.jar b/libs/tomp2p/tomp2p-core-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-core-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-core-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-dht-5.0-Beta8.jar b/libs/tomp2p/tomp2p-dht-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-dht-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-dht-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-nat-5.0-Beta8.jar b/libs/tomp2p/tomp2p-nat-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-nat-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-nat-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-replication-5.0-Beta8.jar b/libs/tomp2p/tomp2p-replication-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-replication-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-replication-5.0-Beta8.jar
diff --git a/src/libs/lib/tomp2p-tracker-5.0-Beta8.jar b/libs/tomp2p/tomp2p-tracker-5.0-Beta8.jar
similarity index 100%
rename from src/libs/lib/tomp2p-tracker-5.0-Beta8.jar
rename to libs/tomp2p/tomp2p-tracker-5.0-Beta8.jar
diff --git a/src/libs/lib/weupnp-0.1.2.jar b/libs/tomp2p/weupnp-0.1.2.jar
similarity index 100%
rename from src/libs/lib/weupnp-0.1.2.jar
rename to libs/tomp2p/weupnp-0.1.2.jar
diff --git a/src/libs/lib/mapdb-1.0.6.jar b/src/libs/lib/mapdb-1.0.6.jar
deleted file mode 100644
index afa75b1..0000000
Binary files a/src/libs/lib/mapdb-1.0.6.jar and /dev/null differ
diff --git a/src/libs/lib/tomp2p-storage-5.0-Beta8.jar b/src/libs/lib/tomp2p-storage-5.0-Beta8.jar
deleted file mode 100644
index 12dccdc..0000000
Binary files a/src/libs/lib/tomp2p-storage-5.0-Beta8.jar and /dev/null differ
diff --git a/src/main/kotlin/io/github/chronosx88/dhtBootstrap/Main.kt b/src/main/kotlin/io/github/chronosx88/dhtBootstrap/Main.kt
index f824ce4..0899dcc 100644
--- a/src/main/kotlin/io/github/chronosx88/dhtBootstrap/Main.kt
+++ b/src/main/kotlin/io/github/chronosx88/dhtBootstrap/Main.kt
@@ -1,5 +1,4 @@
-package io.github.chronosx88.dhtBootstrap
-
+import io.github.chronosx88.dhtBootstrap.StorageBerkeleyDB
 import net.tomp2p.connection.DSASignatureFactory
 import net.tomp2p.dht.PeerBuilderDHT
 import net.tomp2p.dht.PeerDHT
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 96b0cc0..0000000
--- a/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: json-simple-1.1.jar kotlin-stdlib-common-1.3.21.jar tomp2p
- -all-5.0-Beta8.jar tomp2p-tracker-5.0-Beta8.jar netty-buffer-4.0.28.F
- inal.jar log4j-1.2.17.jar annotations-13.0.jar tomp2p-dht-5.0-Beta8.j
- ar netty-common-4.0.28.Final.jar kotlin-stdlib-1.3.21.jar gcm-server-
- 1.0.2.jar tomp2p-storage-5.0-Beta8.jar slf4j-log4j12-1.8.0-beta4.jar 
- weupnp-0.1.2.jar slf4j-api-1.8.0-beta4.jar tomp2p-replication-5.0-Bet
- a8.jar kotlin-stdlib-jdk8-1.3.21.jar tomp2p-nat-5.0-Beta8.jar netty-t
- ransport-4.0.28.Final.jar kotlin-stdlib-jdk7-1.3.21.jar tomp2p-androi
- d-5.0-Beta8.jar tomp2p-core-5.0-Beta8.jar mapdb-1.0.6.jar
-Main-Class: io.github.chronosx88.MainKt
-