diff --git a/net/pom.xml b/bootstrap/pom.xml
similarity index 98%
rename from net/pom.xml
rename to bootstrap/pom.xml
index 2da859bd74..8e254a59e3 100644
--- a/net/pom.xml
+++ b/bootstrap/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>net</artifactId>
+    <artifactId>bootstrap</artifactId>
 
     <build>
 
diff --git a/gui/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
rename to bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
diff --git a/gui/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
rename to bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
diff --git a/bootstrap/target/BootstrapNodeMain.jar b/bootstrap/target/BootstrapNodeMain.jar
new file mode 100644
index 0000000000..f3ff781b07
Binary files /dev/null and b/bootstrap/target/BootstrapNodeMain.jar differ
diff --git a/bootstrap/target/maven-archiver/pom.properties b/bootstrap/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000..79179bc3e6
--- /dev/null
+++ b/bootstrap/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Mar 13 20:11:20 CET 2015
+version=0.1.2-SNAPSHOT
+groupId=io.bitsquare
+artifactId=bootstrap
diff --git a/gui/src/main/java/io/bitsquare/util/tasks/TaskInterception.java b/gui/src/main/java/io/bitsquare/util/tasks/TaskInterception.java
deleted file mode 100644
index 95678215ec..0000000000
--- a/gui/src/main/java/io/bitsquare/util/tasks/TaskInterception.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of Bitsquare.
- *
- * Bitsquare is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.bitsquare.util.tasks;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TaskInterception {
-    private static final Logger log = LoggerFactory.getLogger(TaskInterception.class);
-    public static Class<? extends Task> taskToInterceptBeforeRun;
-    public static Class<? extends Task> taskToInterceptAfterRun;
-}
diff --git a/pom.xml b/pom.xml
index 2054353318..fe51ff3263 100755
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,7 @@
 
     <modules>
         <module>gui</module>
-        <module>common</module>
-        <module>net</module>
+        <module>bootstrap</module>
     </modules>
 
     <build>