diff --git a/src/main/java/io/bitsquare/di/AbstractBitsquareModule.java b/src/main/java/io/bitsquare/AbstractBitsquareModule.java
similarity index 98%
rename from src/main/java/io/bitsquare/di/AbstractBitsquareModule.java
rename to src/main/java/io/bitsquare/AbstractBitsquareModule.java
index c1faec2079..72c51ef129 100644
--- a/src/main/java/io/bitsquare/di/AbstractBitsquareModule.java
+++ b/src/main/java/io/bitsquare/AbstractBitsquareModule.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.di;
+package io.bitsquare;
 
 import com.google.common.collect.Sets;
 
diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java
index 6d8d751bd4..1b3d7b37b6 100644
--- a/src/main/java/io/bitsquare/btc/BitcoinModule.java
+++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.di.AbstractBitsquareModule;
+import io.bitsquare.AbstractBitsquareModule;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
diff --git a/src/main/java/io/bitsquare/crypto/CryptoModule.java b/src/main/java/io/bitsquare/crypto/CryptoModule.java
index 84452ba2a4..4f114b65d1 100644
--- a/src/main/java/io/bitsquare/crypto/CryptoModule.java
+++ b/src/main/java/io/bitsquare/crypto/CryptoModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.crypto;
 
-import io.bitsquare.di.AbstractBitsquareModule;
+import io.bitsquare.AbstractBitsquareModule;
 
 import java.util.Properties;
 
diff --git a/src/main/java/io/bitsquare/di/BitsquareModule.java b/src/main/java/io/bitsquare/di/BitsquareModule.java
index d9b2cbdfd0..c72265db23 100644
--- a/src/main/java/io/bitsquare/di/BitsquareModule.java
+++ b/src/main/java/io/bitsquare/di/BitsquareModule.java
@@ -17,6 +17,7 @@
 
 package io.bitsquare.di;
 
+import io.bitsquare.AbstractBitsquareModule;
 import io.bitsquare.btc.BitcoinModule;
 import io.bitsquare.crypto.CryptoModule;
 import io.bitsquare.gui.GuiModule;
diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java
index 9e50f4b843..dd39924be1 100644
--- a/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui;
 
-import io.bitsquare.di.AbstractBitsquareModule;
+import io.bitsquare.AbstractBitsquareModule;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.trade.offerbook.OfferBook;
diff --git a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
index 4c288cd997..acfe38eceb 100644
--- a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
+++ b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.msg;
 
-import io.bitsquare.di.AbstractBitsquareModule;
+import io.bitsquare.AbstractBitsquareModule;
 
 import com.google.inject.Injector;
 import com.google.inject.name.Names;
diff --git a/src/main/java/io/bitsquare/trade/TradeModule.java b/src/main/java/io/bitsquare/trade/TradeModule.java
index 6290a39fba..3ccd4fc18c 100644
--- a/src/main/java/io/bitsquare/trade/TradeModule.java
+++ b/src/main/java/io/bitsquare/trade/TradeModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.di.AbstractBitsquareModule;
+import io.bitsquare.AbstractBitsquareModule;
 
 import java.util.Properties;