diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3eb6376b7..eb6e630bd 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -26,7 +26,6 @@
         <module name="commons" />
         <module name="keychain" />
         <module name="launcher" />
-        <module name="uber-jar" />
         <module name="ui" />
       </profile>
     </annotationProcessing>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index be156c7af..0e7df1ed1 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -6,7 +6,6 @@
     <file url="file://$PROJECT_DIR$/main/commons" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/main/keychain" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/main/launcher" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/uber-jar" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/main/ui" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index bd58d0e39..803e13215 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,27 +38,46 @@ deploy:
 - provider: script # SNAPSHOTS
   skip_cleanup: true
   script: >-
-    curl -T main/ant-kit/target/antkit.zip
+    curl -T main/buildkit/target/buildkit-linux.zip
     -u cryptobot:${BINTRAY_API_KEY}
-    -H "X-Bintray-Package:ant-kit"
+    -H "X-Bintray-Package:buildkit"
     -H "X-Bintray-Version:continuous"
     -H "X-Bintray-Override:1"
     -H "X-Bintray-Publish:1"
-    https://api.bintray.com/content/cryptomator/cryptomator/antkit-continuous.zip
+    https://api.bintray.com/content/cryptomator/cryptomator/buildkit-linux-continuous.zip
   on:
     repo: cryptomator/cryptomator
     branch: develop
     condition: $TRAVIS_TAG = ''
-- provider: releases # RELEASE
-  prerelease: false
-  api_key: $GITHUB_API_KEY
-  file:
-  - "main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar"
+- provider: script
   skip_cleanup: true
+  script: >-
+    curl -T main/buildkit/target/buildkit-mac.zip
+    -u cryptobot:${BINTRAY_API_KEY}
+    -H "X-Bintray-Package:buildkit"
+    -H "X-Bintray-Version:continuous"
+    -H "X-Bintray-Override:1"
+    -H "X-Bintray-Publish:1"
+    https://api.bintray.com/content/cryptomator/cryptomator/buildkit-mac-continuous.zip
   on:
     repo: cryptomator/cryptomator
-    tags: true
+    branch: develop
+    condition: $TRAVIS_TAG = ''
 - provider: script
+  skip_cleanup: true
+  script: >-
+    curl -T main/buildkit/target/buildkit-win.zip
+    -u cryptobot:${BINTRAY_API_KEY}
+    -H "X-Bintray-Package:buildkit"
+    -H "X-Bintray-Version:continuous"
+    -H "X-Bintray-Override:1"
+    -H "X-Bintray-Publish:1"
+    https://api.bintray.com/content/cryptomator/cryptomator/buildkit-win-continuous.zip
+  on:
+    repo: cryptomator/cryptomator
+    branch: develop
+    condition: $TRAVIS_TAG = ''
+- provider: script # RELEASE
   skip_cleanup: true
   script: >-
     curl -T main/buildkit/target/buildkit-linux.zip
diff --git a/main/pom.xml b/main/pom.xml
index 822b0d754..dbd477902 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -268,7 +268,6 @@
 		<profile>
 			<id>release</id>
 			<modules>
-				<module>uber-jar</module>
 				<module>buildkit</module>
 			</modules>
 		</profile>
diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml
deleted file mode 100644
index fa28bfada..000000000
--- a/main/uber-jar/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>uber-jar</artifactId>
-	<name>Single über jar with all dependencies</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>launcher</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<finalName>Cryptomator-${project.version}</finalName>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-					<transformers>
-						<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-							<manifestEntries>
-								<Main-Class>org.cryptomator.launcher.Cryptomator</Main-Class>
-								<Implementation-Version>${project.version}</Implementation-Version>
-							</manifestEntries>
-						</transformer>
-					</transformers>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/main/uber-jar/src/main/resources/logback.xml b/main/uber-jar/src/main/resources/logback.xml
deleted file mode 100644
index 721175d1c..000000000
--- a/main/uber-jar/src/main/resources/logback.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xml>
-<!-- log config used during unit tests and starts from IDE. For production please specify -Dlogback.configurationFile=/path/to/config -->
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.cryptomator" level="DEBUG" />
-	<logger name="org.eclipse.jetty" level="INFO" />
-	<logger name="org.eclipse.jetty.server.Server" level="INFO" />
-	<logger name="org.apache" level="INFO" />
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>