diff --git a/.editorconfig b/.editorconfig
index c4a6191..eb0b2c4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,6 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[.idea/codeStyles/*.xml]
+indent_size = 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..f619d2f
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,62 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_ATTRIBUTE_WRAP" value="0" />
+      <option name="HTML_TEXT_WRAP" value="0" />
+      <option name="HTML_ALIGN_ATTRIBUTES" value="false" />
+    </HTMLCodeStyleSettings>
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="bisq.core" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="bisq.network" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="bisq.common" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.bitcoinj" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="joptsimple" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com.google.inject" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com.google.common" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.apache.commons" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.bouncycastle" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java.security" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java.nio" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java.io" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java.util" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.slf4j" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="ch.qos.logback" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="lombok" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <emptyLine />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d73c3ad..5965417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.bisq</groupId>
-    <artifactId>statsnode</artifactId>
+    <groupId>network.bisq</groupId>
+    <artifactId>bisq-statsnode</artifactId>
     <version>0.7.0-SNAPSHOT</version>
 
     <build>
@@ -85,7 +85,7 @@
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <manifestEntries>
-                                <Main-Class>io.bisq.statistics.StatisticsMain</Main-Class>
+                                <Main-Class>bisq.statistics.StatisticsMain</Main-Class>
                                 <!-- the specified bouncy castle jar classes  -->
                                 <Class-Path>lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar</Class-Path>
                             </manifestEntries>
@@ -132,9 +132,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.bisq</groupId>
+            <groupId>network.bisq</groupId>
             <artifactId>bisq-core</artifactId>
-            <version>975d446</version>
+            <version>-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/src/main/java/io/bisq/statistics/Statistics.java b/src/main/java/bisq/statistics/Statistics.java
similarity index 79%
rename from src/main/java/io/bisq/statistics/Statistics.java
rename to src/main/java/bisq/statistics/Statistics.java
index efb25d6..12cca91 100644
--- a/src/main/java/io/bisq/statistics/Statistics.java
+++ b/src/main/java/bisq/statistics/Statistics.java
@@ -1,44 +1,71 @@
-package io.bisq.statistics;
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.statistics;
+
+import bisq.core.app.AppOptionKeys;
+import bisq.core.app.AppSetup;
+import bisq.core.app.AppSetupWithP2P;
+import bisq.core.app.BisqEnvironment;
+import bisq.core.arbitration.ArbitratorManager;
+import bisq.core.btc.BaseCurrencyNetwork;
+import bisq.core.btc.wallet.BsqWalletService;
+import bisq.core.btc.wallet.BtcWalletService;
+import bisq.core.btc.wallet.WalletsSetup;
+import bisq.core.offer.OfferBookService;
+import bisq.core.offer.OpenOfferManager;
+import bisq.core.provider.price.PriceFeedService;
+import bisq.core.trade.statistics.TradeStatisticsManager;
+
+import bisq.network.p2p.BootstrapListener;
+import bisq.network.p2p.P2PService;
+
+import bisq.common.CommonOptionKeys;
+import bisq.common.UserThread;
+import bisq.common.app.Capabilities;
+import bisq.common.app.Log;
+import bisq.common.app.Version;
+import bisq.common.crypto.LimitedKeyStrengthException;
+import bisq.common.handlers.ResultHandler;
+import bisq.common.locale.CurrencyUtil;
+import bisq.common.locale.Res;
+import bisq.common.util.Utilities;
+
+import org.bitcoinj.store.BlockStoreException;
 
-import ch.qos.logback.classic.Level;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import io.bisq.common.CommonOptionKeys;
-import io.bisq.common.UserThread;
-import io.bisq.common.app.Capabilities;
-import io.bisq.common.app.Log;
-import io.bisq.common.app.Version;
-import io.bisq.common.crypto.LimitedKeyStrengthException;
-import io.bisq.common.handlers.ResultHandler;
-import io.bisq.common.locale.CurrencyUtil;
-import io.bisq.common.locale.Res;
-import io.bisq.common.util.Utilities;
-import io.bisq.core.app.AppOptionKeys;
-import io.bisq.core.app.AppSetup;
-import io.bisq.core.app.AppSetupWithP2P;
-import io.bisq.core.app.BisqEnvironment;
-import io.bisq.core.arbitration.ArbitratorManager;
-import io.bisq.core.btc.BaseCurrencyNetwork;
-import io.bisq.core.btc.wallet.BsqWalletService;
-import io.bisq.core.btc.wallet.BtcWalletService;
-import io.bisq.core.btc.wallet.WalletsSetup;
-import io.bisq.core.offer.OfferBookService;
-import io.bisq.core.offer.OpenOfferManager;
-import io.bisq.core.provider.price.PriceFeedService;
-import io.bisq.core.trade.statistics.TradeStatisticsManager;
-import io.bisq.network.p2p.BootstrapListener;
-import io.bisq.network.p2p.P2PService;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.bitcoinj.store.BlockStoreException;
+
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-import java.nio.file.Paths;
 import java.security.NoSuchAlgorithmException;
 import java.security.Security;
+
+import java.nio.file.Paths;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import ch.qos.logback.classic.Level;
+
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class Statistics {
     public static final String VERSION = "0.6.1";
diff --git a/src/main/java/io/bisq/statistics/StatisticsMain.java b/src/main/java/bisq/statistics/StatisticsMain.java
similarity index 94%
rename from src/main/java/io/bisq/statistics/StatisticsMain.java
rename to src/main/java/bisq/statistics/StatisticsMain.java
index 459b8ce..608917a 100644
--- a/src/main/java/io/bisq/statistics/StatisticsMain.java
+++ b/src/main/java/bisq/statistics/StatisticsMain.java
@@ -15,31 +15,38 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bisq.statistics;
+package bisq.statistics;
+
+import bisq.core.app.AppOptionKeys;
+import bisq.core.app.BisqEnvironment;
+import bisq.core.app.BisqExecutable;
+
+import bisq.common.UserThread;
+import bisq.common.util.Profiler;
+import bisq.common.util.RestartUtil;
+import bisq.common.util.Utilities;
+
+import org.bitcoinj.store.BlockStoreException;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.bisq.common.UserThread;
-import io.bisq.common.util.Profiler;
-import io.bisq.common.util.RestartUtil;
-import io.bisq.common.util.Utilities;
-import io.bisq.core.app.AppOptionKeys;
-import io.bisq.core.app.BisqEnvironment;
-import io.bisq.core.app.BisqExecutable;
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.bitcoinj.store.BlockStoreException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+
 import java.util.Locale;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-import static io.bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
-import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
+import static bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
 
 public class StatisticsMain extends BisqExecutable {
     private static final Logger log = LoggerFactory.getLogger(StatisticsMain.class);
diff --git a/src/main/java/io/bisq/statistics/StatisticsModule.java b/src/main/java/bisq/statistics/StatisticsModule.java
similarity index 76%
rename from src/main/java/io/bisq/statistics/StatisticsModule.java
rename to src/main/java/bisq/statistics/StatisticsModule.java
index 05e0d9f..57c5cec 100644
--- a/src/main/java/io/bisq/statistics/StatisticsModule.java
+++ b/src/main/java/bisq/statistics/StatisticsModule.java
@@ -15,37 +15,41 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bisq.statistics;
+package bisq.statistics;
+
+import bisq.core.alert.AlertModule;
+import bisq.core.app.AppOptionKeys;
+import bisq.core.app.BisqEnvironment;
+import bisq.core.arbitration.ArbitratorModule;
+import bisq.core.btc.BitcoinModule;
+import bisq.core.dao.DaoModule;
+import bisq.core.filter.FilterModule;
+import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
+import bisq.core.network.p2p.seed.SeedNodeAddressLookup;
+import bisq.core.offer.OfferModule;
+import bisq.core.proto.network.CoreNetworkProtoResolver;
+import bisq.core.proto.persistable.CorePersistenceProtoResolver;
+import bisq.core.trade.TradeModule;
+import bisq.core.user.Preferences;
+import bisq.core.user.User;
+
+import bisq.network.crypto.EncryptionServiceModule;
+import bisq.network.p2p.P2PModule;
+import bisq.network.p2p.network.BridgeAddressProvider;
+import bisq.network.p2p.seed.SeedNodeRepository;
+
+import bisq.common.Clock;
+import bisq.common.app.AppModule;
+import bisq.common.crypto.KeyRing;
+import bisq.common.crypto.KeyStorage;
+import bisq.common.proto.network.NetworkProtoResolver;
+import bisq.common.proto.persistable.PersistenceProtoResolver;
+import bisq.common.storage.Storage;
+
+import org.springframework.core.env.Environment;
 
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
-import io.bisq.common.Clock;
-import io.bisq.common.app.AppModule;
-import io.bisq.common.crypto.KeyRing;
-import io.bisq.common.crypto.KeyStorage;
-import io.bisq.common.proto.network.NetworkProtoResolver;
-import io.bisq.common.proto.persistable.PersistenceProtoResolver;
-import io.bisq.common.storage.Storage;
-import io.bisq.core.alert.AlertModule;
-import io.bisq.core.app.AppOptionKeys;
-import io.bisq.core.app.BisqEnvironment;
-import io.bisq.core.arbitration.ArbitratorModule;
-import io.bisq.core.btc.BitcoinModule;
-import io.bisq.core.dao.DaoModule;
-import io.bisq.core.filter.FilterModule;
-import io.bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
-import io.bisq.core.network.p2p.seed.SeedNodeAddressLookup;
-import io.bisq.core.offer.OfferModule;
-import io.bisq.core.proto.network.CoreNetworkProtoResolver;
-import io.bisq.core.proto.persistable.CorePersistenceProtoResolver;
-import io.bisq.core.trade.TradeModule;
-import io.bisq.core.user.Preferences;
-import io.bisq.core.user.User;
-import io.bisq.network.crypto.EncryptionServiceModule;
-import io.bisq.network.p2p.P2PModule;
-import io.bisq.network.p2p.network.BridgeAddressProvider;
-import io.bisq.network.p2p.seed.SeedNodeRepository;
-import org.springframework.core.env.Environment;
 
 import java.io.File;
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 0b143b9..5cabc40 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ This file is part of Bisq.
-  ~
-  ~ Bisq is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU Affero General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or (at
-  ~ your option) any later version.
-  ~
-  ~ Bisq is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
-  ~ License for more details.
-  ~
-  ~ You should have received a copy of the GNU Affero General Public License
-  ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <configuration>
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -27,24 +10,8 @@
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
 
-    <logger name="io.bisq.common.storage.Storage" level="WARN"/>
-    <logger name="io.bisq.common.storage.FileManager" level="WARN"/>
-
-    <!-- <logger name="io.bisq.p2p.peers" level="WARN"/>
-     <logger name="io.bisq.p2p.peers.getdata" level="WARN"/>
-     <logger name="io.bisq.p2p.peers.keepalive" level="WARN"/>
-     <logger name="io.bisq.p2p.peers.peerexchange" level="WARN"/>
- 
-     <logger name="io.bisq.p2p.network" level="WARN"/>
-     <logger name="io.bisq.p2p.P2PService" level="WARN"/>-->
-
-
-    <!-- <logger name="io.bisq.p2p.peers.PeerGroup" level="INFO"/>
-     <logger name="io.bisq.p2p.P2PService" level="INFO"/>
-     <logger name="io.bisq.p2p.storage.ProtectedExpirableDataStorage" level="INFO"/>
-     <logger name="io.bisq.p2p.network.LocalhostNetworkNode" level="INFO"/>
-     <logger name="io.bisq.p2p.network.TorNetworkNode" level="TRACE"/>
-     <logger name="io.bisq.p2p.network.NetworkNode" level="TRACE"/>-->
+    <logger name="bisq.common.storage.Storage" level="WARN"/>
+    <logger name="bisq.common.storage.FileManager" level="WARN"/>
 
     <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="INFO"/>