diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7eb9a72ed2..a1d960650b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -33,6 +33,10 @@
           <emptyLine />
           <package name="bisq.asset" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="bisq.grpc" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="protobuf" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="io.grpc" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com.google.protobuf" withSubpackages="true" static="false" />
diff --git a/cli/src/main/java/bisq/cli/app/CliCommand.java b/cli/src/main/java/bisq/cli/app/CliCommand.java
index 4d69481234..30b92182b8 100644
--- a/cli/src/main/java/bisq/cli/app/CliCommand.java
+++ b/cli/src/main/java/bisq/cli/app/CliCommand.java
@@ -1,5 +1,12 @@
 package bisq.cli.app;
 
+import bisq.grpc.GetBalanceGrpc;
+import bisq.grpc.GetBalanceRequest;
+import bisq.grpc.GetVersionGrpc;
+import bisq.grpc.GetVersionRequest;
+import bisq.grpc.StopServerGrpc;
+import bisq.grpc.StopServerRequest;
+
 import io.grpc.ManagedChannel;
 import io.grpc.StatusRuntimeException;
 
@@ -13,15 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import static java.lang.System.currentTimeMillis;
 
-
-
-import bisq.grpc.GetBalanceGrpc;
-import bisq.grpc.GetBalanceRequest;
-import bisq.grpc.GetVersionGrpc;
-import bisq.grpc.GetVersionRequest;
-import bisq.grpc.StopServerGrpc;
-import bisq.grpc.StopServerRequest;
-
 @Slf4j
 final class CliCommand {
 
diff --git a/core/src/main/java/bisq/core/grpc/BisqGrpcServer.java b/core/src/main/java/bisq/core/grpc/BisqGrpcServer.java
index b3352ccc8d..1999804f13 100644
--- a/core/src/main/java/bisq/core/grpc/BisqGrpcServer.java
+++ b/core/src/main/java/bisq/core/grpc/BisqGrpcServer.java
@@ -22,19 +22,6 @@ import bisq.core.payment.PaymentAccount;
 import bisq.core.trade.handlers.TransactionResultHandler;
 import bisq.core.trade.statistics.TradeStatistics2;
 
-import io.grpc.Server;
-import io.grpc.ServerBuilder;
-import io.grpc.stub.StreamObserver;
-
-import java.io.IOException;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import lombok.extern.slf4j.Slf4j;
-
-
-
 import bisq.grpc.GetBalanceGrpc;
 import bisq.grpc.GetBalanceReply;
 import bisq.grpc.GetBalanceRequest;
@@ -57,6 +44,17 @@ import bisq.grpc.StopServerGrpc;
 import bisq.grpc.StopServerReply;
 import bisq.grpc.StopServerRequest;
 
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+import io.grpc.stub.StreamObserver;
+
+import java.io.IOException;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.extern.slf4j.Slf4j;
+
 
 /**
  * gRPC server. Gets a instance of BisqFacade passed to access data from the running Bisq instance.
diff --git a/core/src/test/java/bisq/core/util/ProtoUtilTest.java b/core/src/test/java/bisq/core/util/ProtoUtilTest.java
index f982ab122b..dee3b4a249 100644
--- a/core/src/test/java/bisq/core/util/ProtoUtilTest.java
+++ b/core/src/test/java/bisq/core/util/ProtoUtilTest.java
@@ -21,15 +21,13 @@ import bisq.core.offer.OpenOffer;
 
 import bisq.common.proto.ProtoUtil;
 
+import protobuf.OfferPayload;
+
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-
-
-import protobuf.OfferPayload;
-
 @SuppressWarnings("UnusedAssignment")
 public class ProtoUtilTest {
 
diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
index eae85f6ede..0539fa02bc 100644
--- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
+++ b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
@@ -23,6 +23,8 @@ import bisq.network.p2p.SendersNodeAddressMessage;
 import bisq.common.app.Version;
 import bisq.common.proto.ProtoUtil;
 
+import protobuf.NetworkEnvelope;
+
 import com.google.protobuf.ByteString;
 
 import java.util.Set;
@@ -34,10 +36,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-
-
-import protobuf.NetworkEnvelope;
-
 @Slf4j
 @EqualsAndHashCode(callSuper = true)
 @Value
diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
index db0e51eb7f..a47a2f8605 100644
--- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
+++ b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
@@ -24,6 +24,8 @@ import bisq.common.app.Capabilities;
 import bisq.common.app.Version;
 import bisq.common.proto.ProtoUtil;
 
+import protobuf.NetworkEnvelope;
+
 import com.google.protobuf.ByteString;
 
 import java.util.Set;
@@ -35,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jetbrains.annotations.NotNull;
 
-import protobuf.NetworkEnvelope;
-
 @Slf4j
 @EqualsAndHashCode(callSuper = true)
 @Value