diff --git a/.gitignore b/.gitignore
index 61cb4b5..2b5ee2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
-build/artifacts
-lib/build
-lib/optional
-lib/runtime
-lib/packaged
+build
 .idea
 .DS_Store
-target
-java-repl-intellij-plugin.zip
 out
 
diff --git a/.travis.yml b/.travis.yml
index 054fdee..b3b9125 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ install:
   - export PATH=$PATH:$HOME/.local/bin
 
 script:
-  - gradle -Pversion=$JAVAREPL_BUILD_NUMBER clean check  shadowJar
+  - gradle -Pversion=$JAVAREPL_BUILD_NUMBER clean check shadowJar
 
 deploy:
     provider: releases
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index 6c2b806..0000000
--- a/TODO.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-* Simple auto-completion
-* Export evaluations to source file
-* Show the list of recent exceptions
-* Push automatically to ec2
-
-
-fix intellij 11
-
-Error during dispatching of java.awt.event.KeyEvent[KEY_PRESSED,keyCode=74,keyText=J,keyChar='J',modifiers=Alt+Shift,extModifiers=Alt+Shift,keyLocation=KEY_LOCATION_STANDARD,rawCode=74,primaryLevelUnicode=106,scancode=36] on frame0: com.intellij.execution.console.LanguageConsoleViewImpl.<init>(Lcom/intellij/execution/console/LanguageConsoleImpl;)V
-java.lang.NoSuchMethodError: com.intellij.execution.console.LanguageConsoleViewImpl.<init>(Lcom/intellij/execution/console/LanguageConsoleImpl;)V
- at javarepl.plugin.JavaREPLConsoleRunner.initAndRun(JavaREPLConsoleRunner.java:96)
- at javarepl.plugin.JavaREPLConsoleRunner.run(JavaREPLConsoleRunner.java:85)
- at javarepl.plugin.RunJavaREPLConsoleAction.actionPerformed(RunJavaREPLConsoleAction.java:49)
- at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher$3.performAction(IdeKeyEventDispatcher.java:542)
- at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.processAction(IdeKeyEventDispatcher.java:590)
- at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.d(IdeKeyEventDispatcher.java:458)
- at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.dispatchKeyEvent(IdeKeyEventDispatcher.java:206)
- at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:524)
- at com.intellij.ide.IdeEventQueue.b(IdeEventQueue.java:420)
- at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:378)
- at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:269)
- at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:184)
- at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:174)
- at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:169)
- at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:161)
- at java.awt.EventDispatchThread.run(EventDispatchThread.java:122)
-
-
diff --git a/docker-commands.sh b/bin/docker-commands.sh
similarity index 100%
rename from docker-commands.sh
rename to bin/docker-commands.sh
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 21d6a09..0000000
--- a/build.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="javarepl" default="build">
-    <property environment="env"/>
-
-    <condition property="build.number" value="${env.JAVAREPL_BUILD_NUMBER}" else="dev.build">
-        <isset property="env.JAVAREPL_BUILD_NUMBER"/>
-    </condition>
-
-    <property name="build" value="${basedir}/build"/>
-    <property name="artifacts" value="${build}/artifacts"/>
-    <property name="reports" value="${artifacts}/reports"/>
-    <property name="src" value="${basedir}/src"/>
-    <property name="test" value="${basedir}/test"/>
-    <property name="release.version" value="${build.number}"/>
-    <property name="release.install.script" value="ec2-install.sh"/>
-    <property name="release.install.script.path" value="${basedir}/bin/${release.install.script}"/>
-    <property name="release.name" value="${ant.project.name}-${release.version}"/>
-    <property name="release.jar" value="${release.name}.jar"/>
-    <property name="release.jar.path" value="${artifacts}/${release.jar}"/>
-    <property name="release.pom" value="${release.name}.pom"/>
-    <property name="release.pom.path" value="${artifacts}/${release.pom}"/>
-    <property name="release.manifest" value="MANIFEST.MF"/>
-    <property name="release.src" value="${release.name}-sources.jar"/>
-    <property name="release.src.path" value="${artifacts}/${release.src}"/>
-    <property name="release.manifest.path" value="${artifacts}/${release.manifest}"/>
-
-    <property name="s3.repo.path"
-              value="s3://albertlatacz.published/repo/${ant.project.name}/${ant.project.name}/${release.version}"/>
-    <property name="s3.download.path" value="s3://albertlatacz.published/${ant.project.name}"/>
-    <property name="s3.deploy.path" value="s3://albertlatacz.published/tinkerbox/${ant.project.name}"/>
-
-    <property name="tests.jar" value="${release.name}-tests.jar"/>
-    <property name="tests.src" value="${release.name}-test-sources.jar"/>
-    <property name="tests.jar.path" value="${artifacts}/${tests.jar}"/>
-
-    <property name="build.dependencies.dir" value="lib/build"/>
-    <property name="runtime.dependencies.dir" value="lib/runtime"/>
-    <property name="packaged.dependencies.dir" value="lib/packaged"/>
-    <property name="optional.dependencies.dir" value="lib/optional"/>
-    <property name="manual.dependencies.dir" value="lib/manual"/>
-
-    <import file="${build}/macros.xml"/>
-    <import file="${build}/shavenmaven.xml"/>
-
-    <path id="all.dependancies">
-        <fileset dir="${build.dependencies.dir}" includes="**/*.jar"/>
-        <fileset dir="${runtime.dependencies.dir}" includes="**/*.jar"/>
-        <fileset dir="${packaged.dependencies.dir}" includes="**/*.jar"/>
-        <fileset dir="${optional.dependencies.dir}" includes="**/*.jar"/>
-        <fileset dir="${manual.dependencies.dir}" includes="**/*.jar"/>
-    </path>
-
-    <path id="all.jars">
-        <path refid="all.dependancies"/>
-        <path path="${release.jar.path}"/>
-        <path path="${tests.jar.path}"/>
-    </path>
-
-    <target name="update" description="Update library dependencies">
-        <!--<install version="57"/>-->
-        <parallel>
-            <update dependencies="build/build.dependencies"
-                    directory="${build.dependencies.dir}"/>
-            <update dependencies="build/runtime.dependencies"
-                    directory="${runtime.dependencies.dir}"/>
-            <update dependencies="build/packaged.dependencies"
-                    directory="${packaged.dependencies.dir}"/>
-            <update dependencies="build/optional.dependencies"
-                    directory="${optional.dependencies.dir}"/>
-        </parallel>
-    </target>
-
-    <target name="clean" description="cleanup all">
-        <delete dir="${artifacts}"/>
-    </target>
-
-    <target name="compile">
-        <compile.and.jar src="${src}" jar="${release.jar.path}" classpathref="all.dependancies"
-                         version="${release.version}"/>
-
-        <compile.and.jar src="${test}" jar="${tests.jar.path}" classpathref="all.jars" version="${release.version}"/>
-    </target>
-
-    <target name="test">
-        <test jar="${tests.jar.path}" classpathref="all.jars" reports="${reports}"/>
-    </target>
-
-
-    <target name="package">
-        <mkdir dir="${artifacts}"/>
-
-        <zip destfile="${artifacts}/${release.src}" basedir="src"/>
-
-        <zip destfile="${artifacts}/${tests.src}" basedir="test"/>
-
-        <exec executable="git" output="${artifacts}/git.properties">
-            <arg line="log -1 --pretty=format:summary:%s%nchangeset:%H%nuser:%cn"/>
-        </exec>
-        <property file="${artifacts}/git.properties" prefix="git"/>
-
-        <generate.pom artifact.uri="mvn:${ant.project.name}:${ant.project.name}:jar:${release.version}"
-                      dependencies="build/runtime.dependencies"
-                      directory="${artifacts}"/>
-    </target>
-
-    <target name="embed">
-        <embed.libs jar="${release.jar.path}"/>
-    </target>
-
-    <target name="deploy" if="${deploy}">
-        <deploy-to-s3
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.jar.path}"
-                destination="${s3.download.path}/javarepl.jar"/>
-
-        <deploy-to-s3
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.install.script.path}"
-                destination="${s3.download.path}/${release.install.script}"/>
-
-        <deploy-to-s3-maven-repository
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.jar.path}"
-                destination="${s3.repo.path}/${release.jar}"/>
-
-        <deploy-to-s3-maven-repository
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.src.path}"
-                destination="${s3.repo.path}/${release.src}"/>
-
-        <deploy-to-s3-maven-repository
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.pom.path}"
-                destination="${s3.repo.path}/${release.pom}"/>
-
-        <deploy-to-s3
-                key="${env.AWS_KEY}"
-                secret="${env.AWS_SECRET}"
-                source="${release.jar.path}"
-                destination="${s3.deploy.path}/javarepl.jar"/>
-    </target>
-
-
-    <target name="build" description="build all">
-        <parallel>
-            <antcall target="update"/>
-            <antcall target="clean"/>
-        </parallel>
-        <antcall target="compile"/>
-        <parallel>
-            <antcall target="test"/>
-            <antcall target="package"/>
-        </parallel>
-
-        <antcall target="embed"/>
-        <antcall target="deploy"/>
-    </target>
-
-    <target name="fast" description="build all">
-        <parallel>
-            <antcall target="update"/>
-            <antcall target="clean"/>
-        </parallel>
-        <antcall target="compile"/>
-        <parallel>
-            <antcall target="package"/>
-        </parallel>
-
-        <antcall target="embed"/>
-    </target>
-
-</project>