Rebranding: rename package io.bitsquare to io.bisq

common/src/main/java/io/bisq/app/AppModule.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app;
+package io.bisq.app;
 
 import com.google.common.base.Preconditions;
 import com.google.inject.AbstractModule;

common/src/main/java/io/bisq/app/Capabilities.java

@@ -1,4 +1,4 @@
-package io.bitsquare.app;
+package io.bisq.app;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/app/DevEnv.java

@@ -1,4 +1,4 @@
-package io.bitsquare.app;
+package io.bisq.app;
 
 public class DevEnv {
     // Was used for P2P network stress test to adjust several setting for the tests (e.g. use lower btc fees for offers,..)

common/src/main/java/io/bisq/app/Log.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app;
+package io.bisq.app;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -25,7 +25,7 @@ import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
 import ch.qos.logback.core.util.FileSize;
-import io.bitsquare.common.util.Profiler;
+import io.bisq.common.util.Profiler;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;

common/src/main/java/io/bisq/app/Version.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app;
+package io.bisq.app;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ public class Version {
     // The application versions
     // VERSION = 0.5.0.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
-    public static final String VERSION = "0.5.0.0";  
+    public static final String VERSION = "0.5.0.0";
 
     // The version no. for the objects sent over the network. A change will break the serialization of old objects.
     // If objects are used for both network and database the network version is applied.

common/src/main/java/io/bisq/common/ByteArrayUtils.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common;
+package io.bisq.common;
 
-import io.bitsquare.io.LookAheadObjectInputStream;
+import io.bisq.io.LookAheadObjectInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

common/src/main/java/io/bisq/common/Clock.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common;
+package io.bisq.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/CommonOptionKeys.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common;
+package io.bisq.common;
 
 public class CommonOptionKeys {
     public static final String LOG_LEVEL_KEY = "logLevel";

common/src/main/java/io/bisq/common/FrameRateTimer.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common;
+package io.bisq.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/MasterTimer.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common;
+package io.bisq.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/Timer.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common;
+package io.bisq.common;
 
 import java.time.Duration;
 

common/src/main/java/io/bisq/common/UserThread.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common;
+package io.bisq.common;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import org.slf4j.Logger;

common/src/main/java/io/bisq/common/crypto/CryptoException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 public class CryptoException extends Exception {
 

common/src/main/java/io/bisq/common/crypto/DecryptedDataTuple.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
-import io.bitsquare.messages.Message;
+import io.bisq.messages.Message;
 
 import java.security.PublicKey;
 

common/src/main/java/io/bisq/common/crypto/Encryption.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
-import io.bitsquare.messages.Message;
+import io.bisq.messages.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.encoders.Hex;

common/src/main/java/io/bisq/common/crypto/Hash.java

@@ -15,10 +15,10 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import com.google.common.base.Charsets;
-import io.bitsquare.messages.ToProtoBuffer;
+import io.bisq.messages.ToProtoBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.encoders.Hex;

common/src/main/java/io/bisq/common/crypto/KeyRing.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import javax.inject.Inject;
 import java.security.KeyPair;

common/src/main/java/io/bisq/common/crypto/KeyStorage.java

@@ -15,10 +15,10 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import com.google.inject.Inject;
-import io.bitsquare.storage.FileUtil;
+import io.bisq.storage.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/crypto/PubKeyRing.java

@@ -15,11 +15,11 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import com.google.protobuf.ByteString;
-import io.bitsquare.app.Version;
-import io.bitsquare.common.wire.Payload;
+import io.bisq.app.Version;
+import io.bisq.common.wire.Payload;
 import io.bitsquare.common.wire.proto.Messages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,8 +72,8 @@ public final class PubKeyRing implements Payload {
 
     private void init() {
         try {
-        signaturePubKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(signaturePubKeyBytes));
-        encryptionPubKey = KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes));
+            signaturePubKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(signaturePubKeyBytes));
+            encryptionPubKey = KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes));
         } catch (InvalidKeySpecException | NoSuchAlgorithmException | NoSuchProviderException e) {
             e.printStackTrace();
             log.error(e.getMessage());

common/src/main/java/io/bisq/common/crypto/SealedAndSigned.java

@@ -15,11 +15,11 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import com.google.protobuf.ByteString;
-import io.bitsquare.app.Version;
-import io.bitsquare.common.wire.Payload;
+import io.bisq.app.Version;
+import io.bisq.common.wire.Payload;
 import io.bitsquare.common.wire.proto.Messages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public final class SealedAndSigned implements Payload {
      * We have the bytes, now recreate the sigPublicKey. This happens when receiving this class over the wire,
      * because the public key is transient.
      */
-    static PublicKey init(byte[] sigPublicKeyBytes)  {
+    static PublicKey init(byte[] sigPublicKeyBytes) {
         PublicKey publicKey = null;
         try {
             publicKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC")

common/src/main/java/io/bisq/common/crypto/Sig.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import com.google.common.base.Charsets;
 import org.bouncycastle.util.encoders.Base64;

common/src/main/java/io/bisq/common/crypto/Util.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;

common/src/main/java/io/bisq/common/handlers/ErrorMessageHandler.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.handlers;
+package io.bisq.common.handlers;
 
 /**
  * For reporting error message only (UI)

common/src/main/java/io/bisq/common/handlers/ExceptionHandler.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.handlers;
+package io.bisq.common.handlers;
 
 /**
  * For reporting throwable objects only

common/src/main/java/io/bisq/common/handlers/FaultHandler.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.handlers;
+package io.bisq.common.handlers;
 
 /**
  * For reporting a description message and throwable

common/src/main/java/io/bisq/common/handlers/ResultHandler.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.handlers;
+package io.bisq.common.handlers;
 
 public interface ResultHandler {
     void handleResult();

common/src/main/java/io/bisq/common/persistance/Persistable.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common.persistance;
+package io.bisq.common.persistance;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/common/taskrunner/InterceptTaskException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.taskrunner;
+package io.bisq.common.taskrunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/taskrunner/Model.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.taskrunner;
+package io.bisq.common.taskrunner;
 
 public interface Model {
     void persist();

common/src/main/java/io/bisq/common/taskrunner/Task.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.taskrunner;
+package io.bisq.common.taskrunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/taskrunner/TaskRunner.java

@@ -15,10 +15,10 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.taskrunner;
+package io.bisq.common.taskrunner;
 
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
+import io.bisq.common.handlers.ErrorMessageHandler;
+import io.bisq.common.handlers.ResultHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

common/src/main/java/io/bisq/common/util/DesktopUtil.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import java.awt.*;
 import java.io.File;

common/src/main/java/io/bisq/common/util/JsonExclude.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/src/main/java/io/bisq/common/util/LimitedKeyStrengthException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 public class LimitedKeyStrengthException extends Exception {
     public LimitedKeyStrengthException() {

common/src/main/java/io/bisq/common/util/MathUtils.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import com.google.common.math.DoubleMath;
 import org.slf4j.Logger;

common/src/main/java/io/bisq/common/util/Profiler.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/util/ProtoBufferUtils.java

@@ -1,6 +1,6 @@
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
-import io.bitsquare.app.Version;
+import io.bisq.app.Version;
 import io.bitsquare.common.wire.proto.Messages;
 
 /**

common/src/main/java/io/bisq/common/util/RestartUtil.java

@@ -1,4 +1,4 @@
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/common/util/Tuple2.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/common/util/Tuple3.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/common/util/Tuple4.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/common/util/Utilities.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
@@ -23,7 +23,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.*;
-import io.bitsquare.io.LookAheadObjectInputStream;
+import io.bisq.io.LookAheadObjectInputStream;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -452,7 +452,7 @@ public class Utilities {
     }
 
     public static String toTruncatedString(Object message, int maxLength) {
-        if(Objects.nonNull(message)) {
+        if (Objects.nonNull(message)) {
             return StringUtils.abbreviate(message.toString(), maxLength).replace("\n", "");
         }
         return "NULL";

common/src/main/java/io/bisq/common/wire/Payload.java

@@ -1,7 +1,7 @@
-package io.bitsquare.common.wire;
+package io.bisq.common.wire;
 
 import com.google.protobuf.Message;
-import io.bitsquare.messages.ToProtoBuffer;
+import io.bisq.messages.ToProtoBuffer;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/io/LookAheadObjectInputStream.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
-package io.bitsquare.io;
+package io.bisq.io;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/locale/CurrencyTuple.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.locale;
+package io.bisq.locale;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/locale/Res.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.locale;
+package io.bisq.locale;
 
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

common/src/main/java/io/bisq/messages/Message.java

@@ -1,4 +1,4 @@
-package io.bitsquare.messages;
+package io.bisq.messages;
 
 import io.bitsquare.common.wire.proto.Messages;
 
@@ -7,5 +7,5 @@ import java.io.Serializable;
 public interface Message extends Serializable, ToProtoBuffer {
     int getMessageVersion();
 
-     Messages.Envelope toProtoBuf();
+    Messages.Envelope toProtoBuf();
 }

common/src/main/java/io/bisq/messages/ToProtoBuffer.java

@@ -1,4 +1,4 @@
-package io.bitsquare.messages;
+package io.bisq.messages;
 
 import com.google.protobuf.Message;
 

common/src/main/java/io/bisq/storage/FileManager.java

@@ -15,11 +15,11 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.storage;
+package io.bisq.storage;
 
-import io.bitsquare.common.UserThread;
-import io.bitsquare.common.util.Utilities;
-import io.bitsquare.io.LookAheadObjectInputStream;
+import io.bisq.common.UserThread;
+import io.bisq.common.util.Utilities;
+import io.bisq.io.LookAheadObjectInputStream;
 import org.bitcoinj.core.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/java/io/bisq/storage/FileUtil.java

@@ -1,4 +1,4 @@
-package io.bitsquare.storage;
+package io.bisq.storage;
 
 import com.google.common.io.Files;
 import org.slf4j.Logger;

common/src/main/java/io/bisq/storage/PlainTextWrapper.java

@@ -1,4 +1,4 @@
-package io.bitsquare.storage;
+package io.bisq.storage;
 
 import java.io.Serializable;
 

common/src/main/java/io/bisq/storage/ResourceNotFoundException.java

@@ -1,4 +1,4 @@
-package io.bitsquare.storage;
+package io.bisq.storage;
 
 public class ResourceNotFoundException extends Exception {
     public ResourceNotFoundException(String path) {

common/src/main/java/io/bisq/storage/Storage.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.storage;
+package io.bisq.storage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

common/src/main/resources/logback.xml

@@ -10,8 +10,8 @@
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
 
-    <logger name="io.bitsquare.storage.Storage" level="WARN"/>
-    <logger name="io.bitsquare.storage.FileManager" level="WARN"/>
+    <logger name="io.bisq.storage.Storage" level="WARN"/>
+    <logger name="io.bisq.storage.FileManager" level="WARN"/>
     <logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
 
     <!-- <logger name="io.bitsquare.p2p.peers.PeerGroup" level="TRACE"/>

common/src/test/java/io/bisq/common/crypto/EncryptionTest.java

@@ -1,6 +1,6 @@
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
-import io.bitsquare.storage.FileUtil;
+import io.bisq.storage.FileUtil;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.After;
 import org.junit.Before;

common/src/test/java/io/bisq/common/crypto/SigTest.java

@@ -1,6 +1,6 @@
-package io.bitsquare.common.crypto;
+package io.bisq.common.crypto;
 
-import io.bitsquare.storage.FileUtil;
+import io.bisq.storage.FileUtil;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.After;
 import org.junit.Before;

common/src/test/java/io/bisq/common/util/UtilitiesTest.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.common.util;
+package io.bisq.common.util;
 
 import org.bitcoinj.core.Coin;
 import org.junit.Test;

common/src/test/java/io/bisq/common/wire/proto/ProtoBufferTest.java

@@ -1,5 +1,6 @@
-package io.bitsquare.common.wire.proto;
+package io.bisq.common.wire.proto;
 
+import io.bitsquare.common.wire.proto.Messages;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 
@@ -34,7 +35,7 @@ public class ProtoBufferTest {
             assertTrue(isPing(envelope3));
             assertTrue(!isPing(envelope4));
 
-            log.info("3 = {} 4 = {}",isPing(envelope3), isPing(envelope4));
+            log.info("3 = {} 4 = {}", isPing(envelope3), isPing(envelope4));
             log.info(envelope3.toString());
             log.info(envelope4.toString());
 

core/src/main/java/io/bisq/alert/AlertManager.java

@@ -15,18 +15,18 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.alert;
+package io.bisq.alert;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.bitsquare.app.AppOptionKeys;
-import io.bitsquare.app.DevEnv;
-import io.bitsquare.common.crypto.KeyRing;
-import io.bitsquare.messages.alert.Alert;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.p2p.storage.HashMapChangedListener;
-import io.bitsquare.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.user.User;
+import io.bisq.app.AppOptionKeys;
+import io.bisq.app.DevEnv;
+import io.bisq.common.crypto.KeyRing;
+import io.bisq.messages.alert.Alert;
+import io.bisq.p2p.P2PService;
+import io.bisq.p2p.storage.HashMapChangedListener;
+import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
+import io.bisq.user.User;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

core/src/main/java/io/bisq/alert/AlertModule.java

@@ -15,11 +15,11 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.alert;
+package io.bisq.alert;
 
 import com.google.inject.Singleton;
-import io.bitsquare.app.AppModule;
-import io.bitsquare.app.AppOptionKeys;
+import io.bisq.app.AppModule;
+import io.bisq.app.AppOptionKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;

core/src/main/java/io/bisq/alert/PrivateNotificationManager.java

@@ -15,21 +15,21 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.alert;
+package io.bisq.alert;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.bitsquare.app.AppOptionKeys;
-import io.bitsquare.app.DevEnv;
-import io.bitsquare.common.crypto.KeyRing;
-import io.bitsquare.common.crypto.PubKeyRing;
-import io.bitsquare.crypto.DecryptedMsgWithPubKey;
-import io.bitsquare.messages.Message;
-import io.bitsquare.messages.alert.PrivateNotification;
-import io.bitsquare.messages.alert.PrivateNotificationMessage;
-import io.bitsquare.p2p.NodeAddress;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.p2p.messaging.SendMailboxMessageListener;
+import io.bisq.app.AppOptionKeys;
+import io.bisq.app.DevEnv;
+import io.bisq.common.crypto.KeyRing;
+import io.bisq.common.crypto.PubKeyRing;
+import io.bisq.crypto.DecryptedMsgWithPubKey;
+import io.bisq.messages.Message;
+import io.bisq.messages.alert.PrivateNotification;
+import io.bisq.messages.alert.PrivateNotificationMessage;
+import io.bisq.p2p.NodeAddress;
+import io.bisq.p2p.P2PService;
+import io.bisq.p2p.messaging.SendMailboxMessageListener;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

core/src/main/java/io/bisq/app/BitsquareExecutable.java

@@ -15,17 +15,17 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app;
+package io.bisq.app;
 
-import io.bitsquare.BitsquareException;
-import io.bitsquare.btc.RegTestHost;
-import io.bitsquare.common.CommonOptionKeys;
-import io.bitsquare.messages.btc.BitcoinNetwork;
-import io.bitsquare.messages.btc.BtcOptionKeys;
-import io.bitsquare.messages.dao.blockchain.RpcOptionKeys;
-import io.bitsquare.network.NetworkOptionKeys;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.util.joptsimple.EnumValueConverter;
+import io.bisq.BitsquareException;
+import io.bisq.btc.RegTestHost;
+import io.bisq.common.CommonOptionKeys;
+import io.bisq.messages.btc.BitcoinNetwork;
+import io.bisq.messages.btc.BtcOptionKeys;
+import io.bisq.messages.dao.blockchain.RpcOptionKeys;
+import io.bisq.network.NetworkOptionKeys;
+import io.bisq.p2p.P2PService;
+import io.bisq.util.joptsimple.EnumValueConverter;
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -38,7 +38,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.bitsquare.app.BitsquareEnvironment.*;
 import static java.lang.String.format;
 import static java.lang.String.join;
 
@@ -73,73 +72,99 @@ public abstract class BitsquareExecutable {
     }
 
     protected void customizeOptionParsing(OptionParser parser) {
-        parser.accepts(CommonOptionKeys.LOG_LEVEL_KEY, description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", LOG_LEVEL_DEFAULT))
+        parser.accepts(CommonOptionKeys.LOG_LEVEL_KEY,
+                description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", BitsquareEnvironment.LOG_LEVEL_DEFAULT))
                 .withRequiredArg();
 
-        parser.accepts(NetworkOptionKeys.SEED_NODES_KEY, description("Override hard coded seed nodes as comma separated list: E.g. rxdkppp3vicnbgqt.onion:8002, mfla72c4igh5ta2t.onion:8002", ""))
+        parser.accepts(NetworkOptionKeys.SEED_NODES_KEY,
+                description("Override hard coded seed nodes as comma separated list: E.g. rxdkppp3vicnbgqt.onion:8002, mfla72c4igh5ta2t.onion:8002", ""))
                 .withRequiredArg();
-        parser.accepts(NetworkOptionKeys.MY_ADDRESS, description("My own onion address (used for botstrap nodes to exclude itself)", ""))
+        parser.accepts(NetworkOptionKeys.MY_ADDRESS,
+                description("My own onion address (used for botstrap nodes to exclude itself)", ""))
                 .withRequiredArg();
-        parser.accepts(NetworkOptionKeys.BAN_LIST, description("Nodes to exclude from network connections.", ""))
+        parser.accepts(NetworkOptionKeys.BAN_LIST,
+                description("Nodes to exclude from network connections.", ""))
                 .withRequiredArg();
         // use a fixed port as arbitrator use that for his ID
-        parser.accepts(NetworkOptionKeys.PORT_KEY, description("Port to listen on", 9999))
+        parser.accepts(NetworkOptionKeys.PORT_KEY,
+                description("Port to listen on", 9999))
                 .withRequiredArg()
                 .ofType(int.class);
-        parser.accepts(NetworkOptionKeys.USE_LOCALHOST, description("Use localhost network for development", false))
+        parser.accepts(NetworkOptionKeys.USE_LOCALHOST,
+                description("Use localhost network for development", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(NetworkOptionKeys.MAX_CONNECTIONS, description("Max. connections a peer will try to keep", P2PService.MAX_CONNECTIONS_DEFAULT))
+        parser.accepts(NetworkOptionKeys.MAX_CONNECTIONS,
+                description("Max. connections a peer will try to keep", P2PService.MAX_CONNECTIONS_DEFAULT))
                 .withRequiredArg()
                 .ofType(int.class);
-        parser.accepts(NetworkOptionKeys.SOCKS_5_PROXY_BTC_ADDRESS, description("A proxy address to be used for Bitcoin network. [host:port]", ""))
+        parser.accepts(NetworkOptionKeys.SOCKS_5_PROXY_BTC_ADDRESS,
+                description("A proxy address to be used for Bitcoin network. [host:port]", ""))
                 .withRequiredArg();
-        parser.accepts(NetworkOptionKeys.SOCKS_5_PROXY_HTTP_ADDRESS, description("A proxy address to be used for Http requests (should be non-Tor). [host:port]", ""))
+        parser.accepts(NetworkOptionKeys.SOCKS_5_PROXY_HTTP_ADDRESS,
+                description("A proxy address to be used for Http requests (should be non-Tor). [host:port]", ""))
                 .withRequiredArg();
-        parser.accepts(NetworkOptionKeys.SOCKS5_DISCOVER_MODE, description("Specify discovery mode for Bitcoin nodes. One or more of: [ADDR, DNS, ONION, ALL]" +
-                " (comma separated, they get OR'd together). Default value is ALL", "ALL"))
+        parser.accepts(NetworkOptionKeys.SOCKS5_DISCOVER_MODE,
+                description("Specify discovery mode for Bitcoin nodes. One or more of: [ADDR, DNS, ONION, ALL]" +
+                        " (comma separated, they get OR'd together). Default value is ALL", "ALL"))
                 .withRequiredArg();
 
-        parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
+        parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY,
+                description("User data directory", BitsquareEnvironment.DEFAULT_USER_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(AppOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
+        parser.accepts(AppOptionKeys.APP_NAME_KEY,
+                description("Application name", BitsquareEnvironment.DEFAULT_APP_NAME))
                 .withRequiredArg();
-        parser.accepts(AppOptionKeys.MAX_MEMORY, description("Max. permitted memory (used only at headless versions)", 600))
+        parser.accepts(AppOptionKeys.MAX_MEMORY,
+                description("Max. permitted memory (used only at headless versions)", 600))
                 .withRequiredArg();
-        parser.accepts(AppOptionKeys.APP_DATA_DIR_KEY, description("Application data directory", DEFAULT_APP_DATA_DIR))
+        parser.accepts(AppOptionKeys.APP_DATA_DIR_KEY,
+                description("Application data directory", BitsquareEnvironment.DEFAULT_APP_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(AppOptionKeys.IGNORE_DEV_MSG_KEY, description("If set to true all signed messages from bisq developers are ignored " +
-                "(Global alert, Version update alert, Filters for offers, nodes or trading account data)", false))
+        parser.accepts(AppOptionKeys.IGNORE_DEV_MSG_KEY,
+                description("If set to true all signed messages from bisq developers are ignored " +
+                        "(Global alert, Version update alert, Filters for offers, nodes or trading account data)", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(AppOptionKeys.DUMP_STATISTICS, description("If set to true the trade statistics are stored as json file in the data dir.", false))
+        parser.accepts(AppOptionKeys.DUMP_STATISTICS,
+                description("If set to true the trade statistics are stored as json file in the data dir.", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(AppOptionKeys.PROVIDERS, description("Custom providers (comma separated)", false))
+        parser.accepts(AppOptionKeys.PROVIDERS,
+                description("Custom providers (comma separated)", false))
                 .withRequiredArg();
 
-        parser.accepts(RpcOptionKeys.RPC_USER, description("Bitcoind rpc username", ""))
+        parser.accepts(RpcOptionKeys.RPC_USER,
+                description("Bitcoind rpc username", ""))
                 .withRequiredArg();
-        parser.accepts(RpcOptionKeys.RPC_PASSWORD, description("Bitcoind rpc password", ""))
+        parser.accepts(RpcOptionKeys.RPC_PASSWORD,
+                description("Bitcoind rpc password", ""))
                 .withRequiredArg();
-        parser.accepts(RpcOptionKeys.RPC_PORT, description("Bitcoind rpc port", ""))
+        parser.accepts(RpcOptionKeys.RPC_PORT,
+                description("Bitcoind rpc port", ""))
                 .withRequiredArg();
-        parser.accepts(RpcOptionKeys.RPC_BLOCK_PORT, description("Bitcoind rpc port for block notifications", ""))
+        parser.accepts(RpcOptionKeys.RPC_BLOCK_PORT,
+                description("Bitcoind rpc port for block notifications", ""))
                 .withRequiredArg();
-        parser.accepts(RpcOptionKeys.RPC_WALLET_PORT, description("Bitcoind rpc port for wallet notifications", ""))
+        parser.accepts(RpcOptionKeys.RPC_WALLET_PORT,
+                description("Bitcoind rpc port for wallet notifications", ""))
                 .withRequiredArg();
 
-        parser.accepts(BtcOptionKeys.BTC_NETWORK, description("Bitcoin network", BitcoinNetwork.DEFAULT.name()))
+        parser.accepts(BtcOptionKeys.BTC_NETWORK,
+                description("Bitcoin network", BitcoinNetwork.DEFAULT.name()))
                 .withRequiredArg()
                 .ofType(String.class);
-                //.withValuesConvertedBy(new EnumValueConverter(String.class));
-        parser.accepts(BtcOptionKeys.REG_TEST_HOST, description("", RegTestHost.DEFAULT))
+        //.withValuesConvertedBy(new EnumValueConverter(String.class));
+        parser.accepts(BtcOptionKeys.REG_TEST_HOST,
+                description("", RegTestHost.DEFAULT))
                 .withRequiredArg()
                 .ofType(RegTestHost.class)
                 .withValuesConvertedBy(new EnumValueConverter(RegTestHost.class));
-        parser.accepts(BtcOptionKeys.BTC_NODES, description("Custom nodes used for BitcoinJ as comma separated IP addresses.", ""))
+        parser.accepts(BtcOptionKeys.BTC_NODES,
+                description("Custom nodes used for BitcoinJ as comma separated IP addresses.", ""))
                 .withRequiredArg();
-        parser.accepts(BtcOptionKeys.USE_TOR_FOR_BTC, description("If set to true BitcoinJ is routed over tor (socks 5 proxy).", ""))
+        parser.accepts(BtcOptionKeys.USE_TOR_FOR_BTC,
+                description("If set to true BitcoinJ is routed over tor (socks 5 proxy).", ""))
                 .withRequiredArg();
     }
 

core/src/main/java/io/bisq/arbitration/ArbitratorManager.java

@@ -15,23 +15,23 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
 import com.google.inject.Inject;
-import io.bitsquare.app.DevEnv;
-import io.bitsquare.common.Timer;
-import io.bitsquare.common.UserThread;
-import io.bitsquare.common.crypto.KeyRing;
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.messages.arbitration.Arbitrator;
-import io.bitsquare.messages.user.Preferences;
-import io.bitsquare.p2p.BootstrapListener;
-import io.bitsquare.p2p.NodeAddress;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.p2p.storage.HashMapChangedListener;
-import io.bitsquare.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.user.User;
+import io.bisq.app.DevEnv;
+import io.bisq.common.Timer;
+import io.bisq.common.UserThread;
+import io.bisq.common.crypto.KeyRing;
+import io.bisq.common.handlers.ErrorMessageHandler;
+import io.bisq.common.handlers.ResultHandler;
+import io.bisq.messages.arbitration.Arbitrator;
+import io.bisq.messages.user.Preferences;
+import io.bisq.p2p.BootstrapListener;
+import io.bisq.p2p.NodeAddress;
+import io.bisq.p2p.P2PService;
+import io.bisq.p2p.storage.HashMapChangedListener;
+import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
+import io.bisq.user.User;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 import org.bitcoinj.core.ECKey;

core/src/main/java/io/bisq/arbitration/ArbitratorModule.java

@@ -15,10 +15,10 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
 import com.google.inject.Singleton;
-import io.bitsquare.app.AppModule;
+import io.bisq.app.AppModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;

core/src/main/java/io/bisq/arbitration/ArbitratorService.java

@@ -15,14 +15,14 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.messages.arbitration.Arbitrator;
-import io.bitsquare.p2p.NodeAddress;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.p2p.storage.HashMapChangedListener;
+import io.bisq.common.handlers.ErrorMessageHandler;
+import io.bisq.common.handlers.ResultHandler;
+import io.bisq.messages.arbitration.Arbitrator;
+import io.bisq.p2p.NodeAddress;
+import io.bisq.p2p.P2PService;
+import io.bisq.p2p.storage.HashMapChangedListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/io/bisq/arbitration/DisputeAlreadyOpenException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
 public class DisputeAlreadyOpenException extends Exception {
     public DisputeAlreadyOpenException() {

core/src/main/java/io/bisq/arbitration/DisputeManager.java

@@ -15,38 +15,38 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.inject.Inject;
-import io.bitsquare.app.Log;
-import io.bitsquare.btc.AddressEntry;
-import io.bitsquare.btc.exceptions.TransactionVerificationException;
-import io.bitsquare.btc.exceptions.WalletException;
-import io.bitsquare.btc.wallet.BtcWalletService;
-import io.bitsquare.btc.wallet.TradeWalletService;
-import io.bitsquare.common.Timer;
-import io.bitsquare.common.UserThread;
-import io.bitsquare.common.crypto.KeyRing;
-import io.bitsquare.common.crypto.PubKeyRing;
-import io.bitsquare.common.handlers.FaultHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.DecryptedMsgWithPubKey;
-import io.bitsquare.messages.Message;
-import io.bitsquare.messages.arbitration.*;
-import io.bitsquare.messages.arbitration.payload.Attachment;
-import io.bitsquare.messages.trade.payload.Contract;
-import io.bitsquare.p2p.BootstrapListener;
-import io.bitsquare.p2p.NodeAddress;
-import io.bitsquare.p2p.P2PService;
-import io.bitsquare.p2p.messaging.SendMailboxMessageListener;
-import io.bitsquare.storage.Storage;
-import io.bitsquare.trade.Tradable;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeManager;
-import io.bitsquare.trade.closed.ClosedTradableManager;
-import io.bitsquare.trade.offer.OpenOffer;
-import io.bitsquare.trade.offer.OpenOfferManager;
+import io.bisq.app.Log;
+import io.bisq.btc.AddressEntry;
+import io.bisq.btc.exceptions.TransactionVerificationException;
+import io.bisq.btc.exceptions.WalletException;
+import io.bisq.btc.wallet.BtcWalletService;
+import io.bisq.btc.wallet.TradeWalletService;
+import io.bisq.common.Timer;
+import io.bisq.common.UserThread;
+import io.bisq.common.crypto.KeyRing;
+import io.bisq.common.crypto.PubKeyRing;
+import io.bisq.common.handlers.FaultHandler;
+import io.bisq.common.handlers.ResultHandler;
+import io.bisq.crypto.DecryptedMsgWithPubKey;
+import io.bisq.messages.Message;
+import io.bisq.messages.arbitration.*;
+import io.bisq.messages.arbitration.payload.Attachment;
+import io.bisq.messages.trade.payload.Contract;
+import io.bisq.p2p.BootstrapListener;
+import io.bisq.p2p.NodeAddress;
+import io.bisq.p2p.P2PService;
+import io.bisq.p2p.messaging.SendMailboxMessageListener;
+import io.bisq.storage.Storage;
+import io.bisq.trade.Tradable;
+import io.bisq.trade.Trade;
+import io.bisq.trade.TradeManager;
+import io.bisq.trade.closed.ClosedTradableManager;
+import io.bisq.trade.offer.OpenOffer;
+import io.bisq.trade.offer.OpenOfferManager;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.bitcoinj.core.AddressFormatException;

core/src/main/java/io/bisq/arbitration/MessageDeliveryFailedException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitration;
+package io.bisq.arbitration;
 
 public class MessageDeliveryFailedException extends Exception {
     public MessageDeliveryFailedException() {

core/src/main/java/io/bisq/btc/AddressEntry.java

@@ -15,11 +15,11 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc;
+package io.bisq.btc;
 
-import io.bitsquare.app.Version;
-import io.bitsquare.common.persistance.Persistable;
-import io.bitsquare.common.util.Utilities;
+import io.bisq.app.Version;
+import io.bisq.common.persistance.Persistable;
+import io.bisq.common.util.Utilities;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.NetworkParameters;

core/src/main/java/io/bisq/btc/AddressEntryException.java

@@ -1,4 +1,4 @@
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 public class AddressEntryException extends Exception {
     public AddressEntryException(String message) {

core/src/main/java/io/bisq/btc/AddressEntryList.java

@@ -15,12 +15,12 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 import com.google.inject.Inject;
-import io.bitsquare.app.Version;
-import io.bitsquare.common.persistance.Persistable;
-import io.bitsquare.storage.Storage;
+import io.bisq.app.Version;
+import io.bisq.common.persistance.Persistable;
+import io.bisq.storage.Storage;
 import org.bitcoinj.core.Wallet;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/btc/BitcoinModule.java

@@ -15,21 +15,21 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 import com.google.inject.Singleton;
-import io.bitsquare.app.AppModule;
-import io.bitsquare.app.AppOptionKeys;
-import io.bitsquare.btc.provider.squ.BsqUtxoFeedService;
-import io.bitsquare.btc.wallet.BsqWalletService;
-import io.bitsquare.btc.wallet.BtcWalletService;
-import io.bitsquare.btc.wallet.TradeWalletService;
-import io.bitsquare.btc.wallet.WalletsSetup;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.messages.btc.BtcOptionKeys;
-import io.bitsquare.messages.btc.UserAgent;
-import io.bitsquare.messages.btc.provider.fee.FeeService;
-import io.bitsquare.messages.provider.price.PriceFeedService;
+import io.bisq.app.AppModule;
+import io.bisq.app.AppOptionKeys;
+import io.bisq.btc.provider.squ.BsqUtxoFeedService;
+import io.bisq.btc.wallet.BsqWalletService;
+import io.bisq.btc.wallet.BtcWalletService;
+import io.bisq.btc.wallet.TradeWalletService;
+import io.bisq.btc.wallet.WalletsSetup;
+import io.bisq.http.HttpClient;
+import io.bisq.messages.btc.BtcOptionKeys;
+import io.bisq.messages.btc.UserAgent;
+import io.bisq.messages.btc.provider.fee.FeeService;
+import io.bisq.messages.provider.price.PriceFeedService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;

core/src/main/java/io/bisq/btc/InsufficientFundsException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 public class InsufficientFundsException extends Exception {
     public InsufficientFundsException(String message) {

core/src/main/java/io/bisq/btc/ProxySocketFactory.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License along with
  * PircBotX. If not, see <http://www.gnu.org/licenses/>.
  */
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 import javax.net.SocketFactory;
 import java.io.IOException;

core/src/main/java/io/bisq/btc/RegTestHost.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 public enum RegTestHost {
 

core/src/main/java/io/bisq/btc/SeedPeersSocks5Dns.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.bitsquare.btc;
+package io.bisq.btc;
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 import com.runjva.sourceforge.jsocks.protocol.SocksSocket;

core/src/main/java/io/bisq/btc/blockchain/GetTransactionRequest.java

@@ -1,11 +1,11 @@
-package io.bitsquare.btc.blockchain;
+package io.bisq.btc.blockchain;
 
 import com.google.common.util.concurrent.*;
-import io.bitsquare.btc.blockchain.providers.BlockchainTxProvider;
-import io.bitsquare.common.Timer;
-import io.bitsquare.common.UserThread;
-import io.bitsquare.common.util.Utilities;
-import io.bitsquare.http.HttpException;
+import io.bisq.btc.blockchain.providers.BlockchainTxProvider;
+import io.bisq.common.Timer;
+import io.bisq.common.UserThread;
+import io.bisq.common.util.Utilities;
+import io.bisq.http.HttpException;
 import org.bitcoinj.core.Coin;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/btc/blockchain/providers/BlockTrailProvider.java

@@ -1,10 +1,10 @@
-package io.bitsquare.btc.blockchain.providers;
+package io.bisq.btc.blockchain.providers;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.bitsquare.app.Log;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.http.HttpException;
+import io.bisq.app.Log;
+import io.bisq.http.HttpClient;
+import io.bisq.http.HttpException;
 import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/blockchain/providers/BlockchainTxProvider.java

@@ -1,8 +1,8 @@
-package io.bitsquare.btc.blockchain.providers;
+package io.bisq.btc.blockchain.providers;
 
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.http.HttpException;
-import io.bitsquare.messages.btc.provider.HttpClientProvider;
+import io.bisq.http.HttpClient;
+import io.bisq.http.HttpException;
+import io.bisq.messages.btc.provider.HttpClientProvider;
 import org.bitcoinj.core.Coin;
 
 import java.io.IOException;

core/src/main/java/io/bisq/btc/blockchain/providers/BlockrIOProvider.java

@@ -1,10 +1,10 @@
-package io.bitsquare.btc.blockchain.providers;
+package io.bisq.btc.blockchain.providers;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.bitsquare.app.Log;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.http.HttpException;
+import io.bisq.app.Log;
+import io.bisq.http.HttpClient;
+import io.bisq.http.HttpException;
 import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/blockchain/providers/TradeBlockProvider.java

@@ -1,10 +1,10 @@
-package io.bitsquare.btc.blockchain.providers;
+package io.bisq.btc.blockchain.providers;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.bitsquare.app.Log;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.http.HttpException;
+import io.bisq.app.Log;
+import io.bisq.http.HttpClient;
+import io.bisq.http.HttpException;
 import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/data/InputsAndChangeOutput.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.data;
+package io.bisq.btc.data;
 
-import io.bitsquare.messages.btc.data.RawTransactionInput;
+import io.bisq.messages.btc.data.RawTransactionInput;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;

core/src/main/java/io/bisq/btc/data/PreparedDepositTxAndOffererInputs.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.data;
+package io.bisq.btc.data;
 
-import io.bitsquare.messages.btc.data.RawTransactionInput;
+import io.bisq.messages.btc.data.RawTransactionInput;
 
 import java.util.ArrayList;
 

core/src/main/java/io/bisq/btc/exceptions/SigningException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.exceptions;
+package io.bisq.btc.exceptions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/exceptions/TransactionVerificationException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.exceptions;
+package io.bisq.btc.exceptions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/exceptions/WalletException.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.exceptions;
+package io.bisq.btc.exceptions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/listeners/AddressConfidenceListener.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.listeners;
+package io.bisq.btc.listeners;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.TransactionConfidence;

core/src/main/java/io/bisq/btc/listeners/BalanceListener.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.listeners;
+package io.bisq.btc.listeners;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;

core/src/main/java/io/bisq/btc/listeners/TxConfidenceListener.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.listeners;
+package io.bisq.btc.listeners;
 
 import org.bitcoinj.core.TransactionConfidence;
 

core/src/main/java/io/bisq/btc/provider/squ/BsqUtxoFeedData.java

@@ -1,4 +1,4 @@
-package io.bitsquare.btc.provider.squ;
+package io.bisq.btc.provider.squ;
 
 import org.bitcoinj.core.UTXO;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/btc/provider/squ/BsqUtxoFeedProvider.java

@@ -1,9 +1,9 @@
-package io.bitsquare.btc.provider.squ;
+package io.bisq.btc.provider.squ;
 
-import io.bitsquare.common.util.Tuple2;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.http.HttpException;
-import io.bitsquare.messages.btc.provider.HttpClientProvider;
+import io.bisq.common.util.Tuple2;
+import io.bisq.http.HttpClient;
+import io.bisq.http.HttpException;
+import io.bisq.messages.btc.provider.HttpClientProvider;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.UTXO;

core/src/main/java/io/bisq/btc/provider/squ/BsqUtxoFeedRequest.java

@@ -1,8 +1,8 @@
-package io.bitsquare.btc.provider.squ;
+package io.bisq.btc.provider.squ;
 
 import com.google.common.util.concurrent.*;
-import io.bitsquare.common.util.Tuple2;
-import io.bitsquare.common.util.Utilities;
+import io.bisq.common.util.Tuple2;
+import io.bisq.common.util.Utilities;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/btc/provider/squ/BsqUtxoFeedService.java

@@ -15,18 +15,18 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.provider.squ;
+package io.bisq.btc.provider.squ;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.inject.Inject;
-import io.bitsquare.app.Log;
-import io.bitsquare.common.UserThread;
-import io.bitsquare.common.handlers.FaultHandler;
-import io.bitsquare.common.util.Tuple2;
-import io.bitsquare.http.HttpClient;
-import io.bitsquare.messages.btc.provider.ProvidersRepository;
+import io.bisq.app.Log;
+import io.bisq.common.UserThread;
+import io.bisq.common.handlers.FaultHandler;
+import io.bisq.common.util.Tuple2;
+import io.bisq.http.HttpClient;
+import io.bisq.messages.btc.provider.ProvidersRepository;
 import org.bitcoinj.core.UTXO;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/btc/wallet/BitsquareDefaultCoinSelector.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import org.bitcoinj.core.*;
 import org.bitcoinj.params.RegTestParams;
@@ -59,7 +59,7 @@ public abstract class BitsquareDefaultCoinSelector implements CoinSelector {
                 if (change == 0 || change >= Transaction.MIN_NONDUST_OUTPUT.value)
                     break;
             }
-            
+
             // Only pick chain-included transactions, or transactions that are ours and pending.
             if (!shouldSelect(output.getParentTransaction()) || !selectOutput(output))
                 continue;

core/src/main/java/io/bisq/btc/wallet/BitsquareKeyChainFactory.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import com.google.common.collect.ImmutableList;
 import org.bitcoinj.crypto.ChildNumber;

core/src/main/java/io/bisq/btc/wallet/BitsquareKeyChainGroup.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.wallet.DeterministicKeyChain;

core/src/main/java/io/bisq/btc/wallet/BsqCoinSelector.java

@@ -15,9 +15,9 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
-import io.bitsquare.dao.blockchain.BsqUTXO;
+import io.bisq.dao.blockchain.BsqUTXO;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.core.TransactionOutput;

core/src/main/java/io/bisq/btc/wallet/BsqDeterministicKeyChain.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import com.google.common.collect.ImmutableList;
 import org.bitcoinj.crypto.ChildNumber;

core/src/main/java/io/bisq/btc/wallet/BsqUtxoTransactionOutput.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.Sha256Hash;

core/src/main/java/io/bisq/btc/wallet/BsqWallet.java

@@ -15,7 +15,7 @@
  * along with bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.btc.wallet;
+package io.bisq.btc.wallet;
 
 import org.bitcoinj.core.*;
 import org.bitcoinj.wallet.KeyChainGroup;