diff --git a/.gitattributes b/.gitattributes
index 6bdc437a2a96533d43d803cf6c463c0a45ff5dbf..b547bb6c452a2b261c588fe985b19b6ddd90b2fe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5003,6 +5003,7 @@ SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/__init__.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase/radbbuslistener.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radbpglistener -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radbpglistener.ini -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radbpglistener.py -text
@@ -5017,7 +5018,6 @@ SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/__init__.py -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/fakedata.py -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py -text
-SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbbuslistener.py -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbchangeshandler.py -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js -text
 SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js -text
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbbuslistener.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radbbuslistener.py
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbbuslistener.py
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase/radbbuslistener.py
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbchangeshandler.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbchangeshandler.py
index 8f3cd6c34fc7110b3426250df19d03e71bee5443..0246f19362d7481f461f7e57fbb07647f50273aa 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbchangeshandler.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/radbchangeshandler.py
@@ -28,7 +28,7 @@ Typical usage is to derive your own subclass from RADBChangesHandler and impleme
 """
 
 from lofar.sas.resourceassignment.database.config import DEFAULT_BUSNAME
-from lofar.sas.resourceassignment.resourceassignmentservice.radbbuslistener import RADBBusListener
+from lofar.sas.resourceassignment.database.radbbuslistener import RADBBusListener
 from lofar.common.util import waitForInterrupt
 from lofar.mom.momqueryservice.momqueryrpc import MoMRPC
 from lofar.mom.momqueryservice.config import DEFAULT_BUSNAME as DEFAULT_MOM_BUSNAME