diff --git a/modules/communication/redis/adapter.py b/modules/communication/redis/adapter.py
index acba10b6288aebd2447deaac7f475c7b2024a686..751a2d15fcf03989a1797c7f63ccc70815a13387 100644
--- a/modules/communication/redis/adapter.py
+++ b/modules/communication/redis/adapter.py
@@ -32,8 +32,8 @@ from datetime import datetime
 from threading import Event
 
 from modules.communication.redis.messenger import RedisMessenger
+from modules.communication.redis.statestore import RedisStateStore
 # from modules.communication.connection_tester import ConnectionTester
-from libraries.database.statestore import RedisStateStore
 from modules.base.exceptions import RedisConnectionException
 from modules.base.enum import RedisChannel, FallbackType
 from modules.base.utils import TerminalColors
diff --git a/modules/communication/redis/messenger.py b/modules/communication/redis/messenger.py
index aae12e4c0205dfe6b05b9288ad4fe243c5951d72..73fab6635d8b8873dd13ce1e65e0cd1f011c50a5 100644
--- a/modules/communication/redis/messenger.py
+++ b/modules/communication/redis/messenger.py
@@ -26,7 +26,7 @@ import time
 import logging
 import datetime
 
-from libraries.database.statestore import RedisStateStore
+from modules.communication.redis.statestore import RedisStateStore
 from modules.communication.mail import AuraMailer
 from modules.base.exceptions import PlaylistException
 from modules.base.enum import RedisChannel
diff --git a/libraries/database/statestore.py b/modules/communication/redis/statestore.py
similarity index 100%
rename from libraries/database/statestore.py
rename to modules/communication/redis/statestore.py