diff --git a/squeaknode/admin/squeak_admin_server_handler.py b/squeaknode/admin/squeak_admin_server_handler.py
index edc66386..dd1ade76 100644
--- a/squeaknode/admin/squeak_admin_server_handler.py
+++ b/squeaknode/admin/squeak_admin_server_handler.py
@@ -12,8 +12,8 @@ from squeaknode.admin.messages import squeak_entry_to_message
 from squeaknode.admin.messages import squeak_peer_to_message
 from squeaknode.admin.messages import squeak_profile_to_message
 from squeaknode.admin.profile_image_util import base64_string_to_bytes
-from squeaknode.core.squeak_controller import SqueakController
 from squeaknode.lightning.lnd_lightning_client import LNDLightningClient
+from squeaknode.node.squeak_controller import SqueakController
 from squeaknode.sync.squeak_sync_controller import SqueakSyncController
 
 logger = logging.getLogger(__name__)
diff --git a/squeaknode/core/squeak_controller.py b/squeaknode/node/squeak_controller.py
similarity index 100%
rename from squeaknode/core/squeak_controller.py
rename to squeaknode/node/squeak_controller.py
diff --git a/squeaknode/node/squeak_node.py b/squeaknode/node/squeak_node.py
index ef8ceb89..c25518f2 100644
--- a/squeaknode/node/squeak_node.py
+++ b/squeaknode/node/squeak_node.py
@@ -9,7 +9,6 @@ from squeaknode.admin.squeak_admin_server_servicer import SqueakAdminServerServi
 from squeaknode.admin.webapp.app import SqueakAdminWebServer
 from squeaknode.bitcoin.bitcoin_core_bitcoin_client import BitcoinCoreBitcoinClient
 from squeaknode.config.config import SqueaknodeConfig
-from squeaknode.core.squeak_controller import SqueakController
 from squeaknode.core.squeak_core import SqueakCore
 from squeaknode.db.db_engine import get_engine
 from squeaknode.db.db_engine import get_sqlite_connection_string
@@ -20,6 +19,7 @@ from squeaknode.node.process_received_payments_worker import ProcessReceivedPaym
 from squeaknode.node.received_payments_subscription_client import (
     OpenReceivedPaymentsSubscriptionClient,
 )
+from squeaknode.node.squeak_controller import SqueakController
 from squeaknode.node.squeak_offer_expiry_worker import SqueakOfferExpiryWorker
 from squeaknode.node.squeak_peer_sync_worker import SqueakPeerSyncWorker
 from squeaknode.node.squeak_rate_limiter import SqueakRateLimiter
diff --git a/squeaknode/server/squeak_server_handler.py b/squeaknode/server/squeak_server_handler.py
index b2347366..1364762a 100644
--- a/squeaknode/server/squeak_server_handler.py
+++ b/squeaknode/server/squeak_server_handler.py
@@ -3,8 +3,8 @@ import logging
 from squeak.core import CSqueak
 
 from proto import squeak_server_pb2
-from squeaknode.core.squeak_controller import SqueakController
 from squeaknode.core.util import get_hash
+from squeaknode.node.squeak_controller import SqueakController
 
 logger = logging.getLogger(__name__)
 
diff --git a/squeaknode/sync/peer_connection.py b/squeaknode/sync/peer_connection.py
index c6488d20..de89c0db 100644
--- a/squeaknode/sync/peer_connection.py
+++ b/squeaknode/sync/peer_connection.py
@@ -4,8 +4,8 @@ from typing import Optional
 
 from squeaknode.core.block_range import BlockRange
 from squeaknode.core.received_offer_with_peer import ReceivedOfferWithPeer
-from squeaknode.core.squeak_controller import SqueakController
 from squeaknode.network.peer_client import PeerClient
+from squeaknode.node.squeak_controller import SqueakController
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/core/test_squeak_controller.py b/tests/node/test_squeak_controller.py
similarity index 98%
rename from tests/core/test_squeak_controller.py
rename to tests/node/test_squeak_controller.py
index 56f0490c..211a59fc 100644
--- a/tests/core/test_squeak_controller.py
+++ b/tests/node/test_squeak_controller.py
@@ -3,11 +3,11 @@ import pytest
 
 from squeaknode.config.config import SqueaknodeConfig
 from squeaknode.core.lightning_address import LightningAddressHostPort
-from squeaknode.core.squeak_controller import SqueakController
 from squeaknode.core.squeak_core import SqueakCore
 from squeaknode.core.squeak_peer import SqueakPeer
 from squeaknode.db.squeak_db import SqueakDb
 from squeaknode.node.payment_processor import PaymentProcessor
+from squeaknode.node.squeak_controller import SqueakController
 from squeaknode.node.squeak_rate_limiter import SqueakRateLimiter