diff --git a/receiver/ubx_query.py b/ubx/query.py
similarity index 91%
rename from receiver/ubx_query.py
rename to ubx/query.py
index d41ef05..ad94179 100644
--- a/receiver/ubx_query.py
+++ b/ubx/query.py
@@ -2,10 +2,10 @@ from msg_container import MsgContainer
 from ubx.ubx import frame_parse, frame_parse_hdr, frame_create
 from ubx.msg import UbxMsg
 from transceiver import Transceiver
-from ubx_receiver import UbxReceiver
+from receiver.ubx_receiver import UbxReceiver
 from threading import BoundedSemaphore
 
-class Query(UbxReceiver):
+class UbxQuery(UbxReceiver):
 	def __init__(self, transceiver: Transceiver, parser: UbxMsg, mclass: int|None = None, mid: int|None = None):
 		UbxReceiver.__init__(self, parser, mclass, mid)
 		self.transceiver = transceiver