diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
index be4d91029b..b46f698c79 100644
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
+++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.app.bootstrap;
 
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.Node;
 
 import net.tomp2p.connection.ChannelClientConfiguration;
 import net.tomp2p.connection.ChannelServerConfiguration;
diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
index 6f3ddd1fe3..fbd49f9dd0 100644
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
+++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
@@ -19,7 +19,7 @@ package io.bitsquare.app.bootstrap;
 
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.app.BitsquareExecutable;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.Node;
 
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
diff --git a/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
index 1d08eb8510..7e6c33bccc 100644
--- a/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
@@ -19,8 +19,8 @@ package io.bitsquare.app;
 
 import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.BitcoinNetwork;
-import io.bitsquare.network.BootstrapNodes;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.BootstrapNodes;
+import io.bitsquare.p2p.Node;
 import io.bitsquare.util.joptsimple.EnumValueConverter;
 
 import java.io.File;
@@ -39,8 +39,8 @@ import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 
 import static io.bitsquare.app.BitsquareEnvironment.*;
-import static io.bitsquare.network.Node.*;
-import static io.bitsquare.network.tomp2p.TomP2PModule.*;
+import static io.bitsquare.p2p.Node.*;
+import static io.bitsquare.p2p.tomp2p.TomP2PModule.*;
 import static java.util.Arrays.asList;
 
 public class BitsquareAppMain extends BitsquareExecutable {
diff --git a/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java b/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
index 90726937e1..77db0274ca 100644
--- a/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
@@ -23,8 +23,8 @@ import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorModule;
 import io.bitsquare.btc.BitcoinModule;
 import io.bitsquare.crypto.CryptoModule;
 import io.bitsquare.gui.GuiModule;
-import io.bitsquare.network.NetworkModule;
-import io.bitsquare.network.tomp2p.TomP2PModule;
+import io.bitsquare.p2p.NetworkModule;
+import io.bitsquare.p2p.tomp2p.TomP2PModule;
 import io.bitsquare.offer.OfferModule;
 import io.bitsquare.offer.tomp2p.TomP2POfferModule;
 import io.bitsquare.persistence.Persistence;
diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
index 917742d1fb..c2ebf5e3de 100644
--- a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
+++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
@@ -19,7 +19,7 @@ package io.bitsquare.arbitration;
 
 
 import io.bitsquare.arbitration.listeners.ArbitratorListener;
-import io.bitsquare.network.DHTService;
+import io.bitsquare.p2p.DHTService;
 
 import java.util.Locale;
 
diff --git a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
index c9ecd8892b..35fabdf4e3 100644
--- a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
+++ b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
@@ -20,8 +20,8 @@ package io.bitsquare.arbitration.tomp2p;
 import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.arbitration.ArbitratorService;
 import io.bitsquare.arbitration.listeners.ArbitratorListener;
-import io.bitsquare.network.tomp2p.TomP2PDHTService;
-import io.bitsquare.network.tomp2p.TomP2PNode;
+import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
+import io.bitsquare.p2p.tomp2p.TomP2PNode;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 3460c8fd9b..be1ce97f84 100644
--- a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -29,9 +29,9 @@ import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.network.BootstrapState;
-import io.bitsquare.network.ClientNode;
-import io.bitsquare.network.MessageService;
+import io.bitsquare.p2p.BootstrapState;
+import io.bitsquare.p2p.ClientNode;
+import io.bitsquare.p2p.MessageService;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index d1ec94ba93..f618394716 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -20,7 +20,7 @@ package io.bitsquare.gui.main.settings.network;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.common.viewfx.view.FxmlView;
 import io.bitsquare.common.viewfx.view.InitializableView;
-import io.bitsquare.network.ClientNode;
+import io.bitsquare.p2p.ClientNode;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/offer/OfferBookService.java b/core/src/main/java/io/bitsquare/offer/OfferBookService.java
index dbf3884ef3..e418fbeabb 100644
--- a/core/src/main/java/io/bitsquare/offer/OfferBookService.java
+++ b/core/src/main/java/io/bitsquare/offer/OfferBookService.java
@@ -19,7 +19,7 @@ package io.bitsquare.offer;
 
 import io.bitsquare.common.handlers.FaultHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.network.DHTService;
+import io.bitsquare.p2p.DHTService;
 
 import java.util.List;
 
diff --git a/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
index b42be46640..01b4212cbd 100644
--- a/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
+++ b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
@@ -19,10 +19,10 @@ package io.bitsquare.offer.tomp2p;
 
 import io.bitsquare.common.handlers.FaultHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.network.tomp2p.TomP2PDHTService;
-import io.bitsquare.network.tomp2p.TomP2PNode;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBookService;
+import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
+import io.bitsquare.p2p.tomp2p.TomP2PNode;
 
 import java.io.IOException;
 
@@ -30,6 +30,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
 
@@ -54,6 +56,7 @@ public class TomP2POfferBookService extends TomP2PDHTService implements OfferBoo
     private final LongProperty invalidationTimestamp = new SimpleLongProperty(0);
 
 
+    @Inject
     public TomP2POfferBookService(TomP2PNode tomP2PNode) {
         super(tomP2PNode);
     }
diff --git a/core/src/main/java/io/bitsquare/network/AddressService.java b/core/src/main/java/io/bitsquare/p2p/AddressService.java
similarity index 90%
rename from core/src/main/java/io/bitsquare/network/AddressService.java
rename to core/src/main/java/io/bitsquare/p2p/AddressService.java
index 109b563fd8..7c0f4808f4 100644
--- a/core/src/main/java/io/bitsquare/network/AddressService.java
+++ b/core/src/main/java/io/bitsquare/p2p/AddressService.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 
-import io.bitsquare.network.listener.GetPeerAddressListener;
+import io.bitsquare.p2p.listener.GetPeerAddressListener;
 
 import java.security.PublicKey;
 
diff --git a/core/src/main/java/io/bitsquare/network/BootstrapNodes.java b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/BootstrapNodes.java
rename to core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
index 7cd58c429a..3050718817 100644
--- a/core/src/main/java/io/bitsquare/network/BootstrapNodes.java
+++ b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/main/java/io/bitsquare/network/BootstrapState.java b/core/src/main/java/io/bitsquare/p2p/BootstrapState.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/BootstrapState.java
rename to core/src/main/java/io/bitsquare/p2p/BootstrapState.java
index 755388ea91..bba4661f92 100644
--- a/core/src/main/java/io/bitsquare/network/BootstrapState.java
+++ b/core/src/main/java/io/bitsquare/p2p/BootstrapState.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 public enum BootstrapState {
     PEER_CREATION_FAILED,
diff --git a/core/src/main/java/io/bitsquare/network/ClientNode.java b/core/src/main/java/io/bitsquare/p2p/ClientNode.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/ClientNode.java
rename to core/src/main/java/io/bitsquare/p2p/ClientNode.java
index bee9dc8a6a..f8cf5e0cdd 100644
--- a/core/src/main/java/io/bitsquare/network/ClientNode.java
+++ b/core/src/main/java/io/bitsquare/p2p/ClientNode.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.security.KeyPair;
 
diff --git a/core/src/main/java/io/bitsquare/network/ConnectionType.java b/core/src/main/java/io/bitsquare/p2p/ConnectionType.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/ConnectionType.java
rename to core/src/main/java/io/bitsquare/p2p/ConnectionType.java
index b39a47254c..acfa2da464 100644
--- a/core/src/main/java/io/bitsquare/network/ConnectionType.java
+++ b/core/src/main/java/io/bitsquare/p2p/ConnectionType.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 public enum ConnectionType {
     UNKNOWN, DIRECT, MANUAL_PORT_FORWARDING, AUTO_PORT_FORWARDING, RELAY
diff --git a/core/src/main/java/io/bitsquare/network/DHTService.java b/core/src/main/java/io/bitsquare/p2p/DHTService.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/DHTService.java
rename to core/src/main/java/io/bitsquare/p2p/DHTService.java
index 811c7337b6..aecf8b88d8 100644
--- a/core/src/main/java/io/bitsquare/network/DHTService.java
+++ b/core/src/main/java/io/bitsquare/p2p/DHTService.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.security.PublicKey;
 
diff --git a/core/src/main/java/io/bitsquare/network/Message.java b/core/src/main/java/io/bitsquare/p2p/Message.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/Message.java
rename to core/src/main/java/io/bitsquare/p2p/Message.java
index 4bd87f60cb..50e20d7cc8 100644
--- a/core/src/main/java/io/bitsquare/network/Message.java
+++ b/core/src/main/java/io/bitsquare/p2p/Message.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/io/bitsquare/network/MessageHandler.java b/core/src/main/java/io/bitsquare/p2p/MessageHandler.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/MessageHandler.java
rename to core/src/main/java/io/bitsquare/p2p/MessageHandler.java
index 80dd754602..834d439ac3 100644
--- a/core/src/main/java/io/bitsquare/network/MessageHandler.java
+++ b/core/src/main/java/io/bitsquare/p2p/MessageHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 public interface MessageHandler {
     void handleMessage(Message message, Peer sender);
diff --git a/core/src/main/java/io/bitsquare/network/MessageService.java b/core/src/main/java/io/bitsquare/p2p/MessageService.java
similarity index 91%
rename from core/src/main/java/io/bitsquare/network/MessageService.java
rename to core/src/main/java/io/bitsquare/p2p/MessageService.java
index f9f1619cfe..9442ff2984 100644
--- a/core/src/main/java/io/bitsquare/network/MessageService.java
+++ b/core/src/main/java/io/bitsquare/p2p/MessageService.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 
 public interface MessageService extends P2PService, MessageHandler {
 
diff --git a/core/src/main/java/io/bitsquare/network/NetworkException.java b/core/src/main/java/io/bitsquare/p2p/NetworkException.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/NetworkException.java
rename to core/src/main/java/io/bitsquare/p2p/NetworkException.java
index b16ef3aa4c..859a1f6b53 100644
--- a/core/src/main/java/io/bitsquare/network/NetworkException.java
+++ b/core/src/main/java/io/bitsquare/p2p/NetworkException.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/io/bitsquare/network/NetworkModule.java b/core/src/main/java/io/bitsquare/p2p/NetworkModule.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/network/NetworkModule.java
rename to core/src/main/java/io/bitsquare/p2p/NetworkModule.java
index 185ed2829a..3446c49b30 100644
--- a/core/src/main/java/io/bitsquare/network/NetworkModule.java
+++ b/core/src/main/java/io/bitsquare/p2p/NetworkModule.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import io.bitsquare.BitsquareModule;
 
diff --git a/core/src/main/java/io/bitsquare/network/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/network/Node.java
rename to core/src/main/java/io/bitsquare/p2p/Node.java
index c0c113438b..53b6fc7164 100644
--- a/core/src/main/java/io/bitsquare/network/Node.java
+++ b/core/src/main/java/io/bitsquare/p2p/Node.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import com.google.common.base.Objects;
 
diff --git a/core/src/main/java/io/bitsquare/network/P2PService.java b/core/src/main/java/io/bitsquare/p2p/P2PService.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/P2PService.java
rename to core/src/main/java/io/bitsquare/p2p/P2PService.java
index 68e78b7a2c..22b49e2544 100644
--- a/core/src/main/java/io/bitsquare/network/P2PService.java
+++ b/core/src/main/java/io/bitsquare/p2p/P2PService.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import java.util.concurrent.Executor;
 
diff --git a/core/src/main/java/io/bitsquare/network/Peer.java b/core/src/main/java/io/bitsquare/p2p/Peer.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/Peer.java
rename to core/src/main/java/io/bitsquare/p2p/Peer.java
index 5012ce0d3e..3c0c41d614 100644
--- a/core/src/main/java/io/bitsquare/network/Peer.java
+++ b/core/src/main/java/io/bitsquare/p2p/Peer.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 /**
  * A peer on the Bitsquare network.
diff --git a/core/src/main/java/io/bitsquare/network/listener/GetPeerAddressListener.java b/core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
similarity index 91%
rename from core/src/main/java/io/bitsquare/network/listener/GetPeerAddressListener.java
rename to core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
index 4c067265a0..d3313acf7c 100644
--- a/core/src/main/java/io/bitsquare/network/listener/GetPeerAddressListener.java
+++ b/core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.listener;
+package io.bitsquare.p2p.listener;
 
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Peer;
 
 public interface GetPeerAddressListener {
     void onResult(Peer peer);
diff --git a/core/src/main/java/io/bitsquare/network/listener/SendMessageListener.java b/core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/network/listener/SendMessageListener.java
rename to core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
index 75ea0dde99..751e0de473 100644
--- a/core/src/main/java/io/bitsquare/network/listener/SendMessageListener.java
+++ b/core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.listener;
+package io.bitsquare.p2p.listener;
 
 public interface SendMessageListener {
     void handleFault();
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
similarity index 99%
rename from core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
index bbadf3b16a..d3d48c39b4 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.BootstrapState;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.BootstrapState;
+import io.bitsquare.p2p.Node;
 
 import com.google.common.util.concurrent.SettableFuture;
 
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PAddressService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PAddressService.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
index e5c5362948..757884b2a9 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PAddressService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.AddressService;
-import io.bitsquare.network.NetworkException;
-import io.bitsquare.network.Peer;
-import io.bitsquare.network.listener.GetPeerAddressListener;
+import io.bitsquare.p2p.AddressService;
+import io.bitsquare.p2p.NetworkException;
+import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.listener.GetPeerAddressListener;
 import io.bitsquare.user.User;
 
 import java.io.IOException;
@@ -171,7 +171,7 @@ public class TomP2PAddressService extends TomP2PDHTService implements AddressSer
     private void removeAddress() {
         try {
             Data data = new Data(new TomP2PPeer(peerDHT.peerAddress()));
-            removeFromDataMap(locationKey, data).awaitUninterruptibly();
+            removeFromDataMap(locationKey, data).awaitUninterruptibly(1000);
         } catch (IOException e) {
             e.printStackTrace();
             log.error("Exception at removeAddress " + e.toString());
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PDHTService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PDHTService.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
index 1c85731b72..be6ef6aabc 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PDHTService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.DHTService;
+import io.bitsquare.p2p.DHTService;
 
 import java.security.PublicKey;
 
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PMessageService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
similarity index 94%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PMessageService.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
index 568b3eef5a..6c06336530 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PMessageService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageHandler;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.Peer;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageHandler;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.listener.SendMessageListener;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PModule.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
similarity index 89%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PModule.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
index 7332b529b4..9ddf08edf1 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PModule.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
@@ -15,14 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.AddressService;
-import io.bitsquare.network.BootstrapNodes;
-import io.bitsquare.network.ClientNode;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.NetworkModule;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.AddressService;
+import io.bitsquare.p2p.BootstrapNodes;
+import io.bitsquare.p2p.ClientNode;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.NetworkModule;
+import io.bitsquare.p2p.Node;
 
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
@@ -30,7 +30,7 @@ import com.google.inject.name.Names;
 
 import org.springframework.core.env.Environment;
 
-import static io.bitsquare.network.tomp2p.BootstrappedPeerBuilder.*;
+import static io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder.*;
 
 public class TomP2PModule extends NetworkModule {
     public static final String BOOTSTRAP_NODE_NAME_KEY = "bootstrap.node.name";
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
index 0d8ff09e30..20ea40a128 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
@@ -15,15 +15,15 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.network.BootstrapState;
-import io.bitsquare.network.ClientNode;
-import io.bitsquare.network.ConnectionType;
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageHandler;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.BootstrapState;
+import io.bitsquare.p2p.ClientNode;
+import io.bitsquare.p2p.ConnectionType;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageHandler;
+import io.bitsquare.p2p.Node;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
index 4702f87e4d..5c251033cb 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Peer;
 
 import com.google.common.base.Objects;
 
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/network/tomp2p/TomP2PService.java
rename to core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
index c04e62a990..c95e4c648d 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
-import io.bitsquare.network.BootstrapState;
-import io.bitsquare.network.P2PService;
+import io.bitsquare.p2p.BootstrapState;
+import io.bitsquare.p2p.P2PService;
 
 import java.util.concurrent.Executor;
 
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 1c444198e6..2f62a1852b 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -23,11 +23,11 @@ import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.network.AddressService;
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.Peer;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.AddressService;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBookService;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
index e7a170629f..e43477b322 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
@@ -18,9 +18,9 @@
 package io.bitsquare.trade.protocol.availability;
 
 import io.bitsquare.common.taskrunner.SharedTaskModel;
-import io.bitsquare.network.AddressService;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.AddressService;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.Peer;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.protocol.trade.messages.OfferMessage;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
index 555c47533a..c96d9f03c2 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
@@ -20,9 +20,9 @@ package io.bitsquare.trade.protocol.availability;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageHandler;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageHandler;
+import io.bitsquare.p2p.Peer;
 import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage;
 import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
 import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
index 34fc460fc8..3ca085e883 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.availability.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.Peer;
-import io.bitsquare.network.listener.GetPeerAddressListener;
+import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.listener.GetPeerAddressListener;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
index 9c7e8a2992..633ef20d01 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.availability.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/SharedTradeModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/SharedTradeModel.java
index 860f8c61ef..bf37de7b65 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/SharedTradeModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/SharedTradeModel.java
@@ -22,7 +22,7 @@ import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.taskrunner.SharedTaskModel;
 import io.bitsquare.crypto.SignatureService;
-import io.bitsquare.network.MessageService;
+import io.bitsquare.p2p.MessageService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/OfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/OfferMessage.java
index d7098b5048..8bd66c1625 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/OfferMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/OfferMessage.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.messages;
 
-import io.bitsquare.network.Message;
+import io.bitsquare.p2p.Message;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
index ee6bba8d27..42ade5ab17 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.messages;
 
-import io.bitsquare.network.Message;
+import io.bitsquare.p2p.Message;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
index 5045ef5870..d1eb0a68c4 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.trade.protocol.trade.offerer;
 
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageHandler;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageHandler;
+import io.bitsquare.p2p.Peer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java
index 66b26454e2..bb7e53e579 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java
@@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.offerer.models;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.SignatureService;
-import io.bitsquare.network.MessageService;
+import io.bitsquare.p2p.MessageService;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.SharedTradeModel;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java
index daf572c9e7..ca4f649cf1 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.offerer.models;
 
 import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Peer;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
index 34ed169e99..5d4cbec4c0 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.messages.RequestDepositPaymentMessage;
 import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
index 29d586f473..61e985f57b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.messages.BankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
index 73f4af822f..7567a39210 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
index 6c190b3c23..3bcfcb3988 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.trade.protocol.trade.taker;
 
-import io.bitsquare.network.Message;
-import io.bitsquare.network.MessageHandler;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.MessageHandler;
+import io.bitsquare.p2p.Peer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.messages.BankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java
index d54dda89a4..8316066098 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.taker.models;
 
 import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.Peer;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.TransactionOutput;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java
index a264f8b3e9..f156ea034d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.models;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.SignatureService;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.Peer;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.Peer;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.SharedTradeModel;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
index 1983c2982c..6815dce768 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java
index 3c8f5a9f5a..bb1430385c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;
 import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
index d7e2e19018..ca012ecdeb 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
@@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.network.listener.SendMessageListener;
+import io.bitsquare.p2p.listener.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.messages.RequestOffererPublishDepositTxMessage;
 import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;
 
diff --git a/core/src/test/java/io/bitsquare/msg/TomP2PTests.java b/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
index 19c08944b9..e2241fbdb9 100644
--- a/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
+++ b/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.msg;
 
-import io.bitsquare.network.BootstrapNodes;
-import io.bitsquare.network.ConnectionType;
-import io.bitsquare.network.Node;
+import io.bitsquare.p2p.BootstrapNodes;
+import io.bitsquare.p2p.ConnectionType;
+import io.bitsquare.p2p.Node;
 import io.bitsquare.util.Repeat;
 import io.bitsquare.util.RepeatRule;
 
diff --git a/core/src/test/java/io/bitsquare/network/NodeTests.java b/core/src/test/java/io/bitsquare/p2p/NodeTests.java
similarity index 98%
rename from core/src/test/java/io/bitsquare/network/NodeTests.java
rename to core/src/test/java/io/bitsquare/p2p/NodeTests.java
index cf31902d8e..da9d16df4a 100644
--- a/core/src/test/java/io/bitsquare/network/NodeTests.java
+++ b/core/src/test/java/io/bitsquare/p2p/NodeTests.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network;
+package io.bitsquare.p2p;
 
 import org.junit.Test;
 
diff --git a/core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java b/core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
similarity index 96%
rename from core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java
rename to core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
index f891197a5d..5cd53a817f 100644
--- a/core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java
+++ b/core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.network.tomp2p;
+package io.bitsquare.p2p.tomp2p;
 
 import org.junit.Test;
 
diff --git a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
index 7c87e7f375..5897604e5a 100644
--- a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
+++ b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
@@ -25,17 +25,17 @@ import io.bitsquare.btc.UserAgent;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.network.BootstrapState;
-import io.bitsquare.network.Node;
-import io.bitsquare.network.tomp2p.BootstrappedPeerBuilder;
-import io.bitsquare.network.tomp2p.TomP2PNode;
+import io.bitsquare.p2p.BootstrapState;
+import io.bitsquare.p2p.Node;
+import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
+import io.bitsquare.p2p.tomp2p.TomP2PNode;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBookService;
 import io.bitsquare.offer.tomp2p.TomP2POfferBookService;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.network.MessageService;
-import io.bitsquare.network.tomp2p.TomP2PMessageService;
+import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.tomp2p.TomP2PMessageService;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;