diff --git a/bec_widgets/cli/server.py b/bec_widgets/applications/companion_app.py
similarity index 100%
rename from bec_widgets/cli/server.py
rename to bec_widgets/applications/companion_app.py
index c1053ae3..05944463 100644
--- a/bec_widgets/cli/server.py
+++ b/bec_widgets/applications/companion_app.py
@@ -19,8 +19,8 @@ from qtpy.QtWidgets import QApplication
 
 import bec_widgets
 from bec_widgets.applications.launch_window import LaunchWindow
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.utils.rpc_register import RPCRegister
 
 logger = bec_logger.logger
 
diff --git a/pyproject.toml b/pyproject.toml
index 3ef4c495..260107e9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ Homepage = "https://gitlab.psi.ch/bec/bec_widgets"
 [project.scripts]
 bec-app = "bec_widgets.applications.main_app:main"
 bec-designer = "bec_widgets.utils.bec_designer:main"
-bec-gui-server = "bec_widgets.cli.server:main"
+bec-gui-server = "bec_widgets.applications.companion_app:main"
 bw-generate-cli = "bec_widgets.cli.generate_cli:main"
 
 [project.optional-dependencies]
diff --git a/tests/unit_tests/test_rpc_server.py b/tests/unit_tests/test_rpc_server.py
index f955ef52..7f83ea13 100644
--- a/tests/unit_tests/test_rpc_server.py
+++ b/tests/unit_tests/test_rpc_server.py
@@ -5,7 +5,7 @@ import pytest
 from bec_lib.service_config import ServiceConfig
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.cli.server import GUIServer
+from bec_widgets.applications.companion_app import GUIServer
 from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.rpc_server import RegistryNotReadyError, RPCServer, SingleshotRPCRepeat