diff --git a/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java b/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java
index 09e9f451088..e3fe211572f 100644
--- a/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java
+++ b/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java
@@ -17,8 +17,6 @@
 
 package bisq.core.app;
 
-import bisq.core.CoreModule;
-
 import bisq.common.UserThread;
 import bisq.common.app.AppModule;
 import bisq.common.app.Version;
diff --git a/core/src/main/java/bisq/core/CoreModule.java b/core/src/main/java/bisq/core/app/CoreModule.java
similarity index 98%
rename from core/src/main/java/bisq/core/CoreModule.java
rename to core/src/main/java/bisq/core/app/CoreModule.java
index 4d921e6501e..431dc1555e3 100644
--- a/core/src/main/java/bisq/core/CoreModule.java
+++ b/core/src/main/java/bisq/core/app/CoreModule.java
@@ -15,11 +15,9 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core;
+package bisq.core.app;
 
 import bisq.core.alert.AlertModule;
-import bisq.core.app.AppOptionKeys;
-import bisq.core.app.BisqEnvironment;
 import bisq.core.btc.BitcoinModule;
 import bisq.core.dao.DaoModule;
 import bisq.core.filter.FilterModule;
diff --git a/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java b/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java
index 75c389288e3..942c49a718b 100644
--- a/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java
+++ b/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java
@@ -19,7 +19,7 @@
 
 import bisq.desktop.DesktopModule;
 
-import bisq.core.CoreModule;
+import bisq.core.app.CoreModule;
 
 import bisq.common.app.AppModule;
 
diff --git a/grpc/src/main/java/bisq/grpc/BisqGrpcServerMain.java b/grpc/src/main/java/bisq/grpc/BisqGrpcServerMain.java
index 3059931b968..7776686a7bb 100644
--- a/grpc/src/main/java/bisq/grpc/BisqGrpcServerMain.java
+++ b/grpc/src/main/java/bisq/grpc/BisqGrpcServerMain.java
@@ -18,10 +18,10 @@
 package bisq.grpc;
 
 import bisq.core.CoreApi;
-import bisq.core.CoreModule;
 import bisq.core.app.BisqExecutable;
 import bisq.core.app.BisqHeadlessAppMain;
 import bisq.core.app.BisqSetup;
+import bisq.core.app.CoreModule;
 
 import bisq.common.UserThread;
 import bisq.common.app.AppModule;