diff --git a/.gitattributes b/.gitattributes
index 1fc3af987da938eaf081d130af1a31bb4146a074..dbe2209736555e1105a4e8ffd1261ead10164298 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4972,6 +4972,7 @@ SAS/OTDB_Services/TreeService.py -text
 SAS/OTDB_Services/TreeStatusEvents.ini -text
 SAS/OTDB_Services/TreeStatusEvents.py -text
 SAS/OTDB_Services/config.py -text
+SAS/OTDB_Services/otdbrpc.py -text
 SAS/OTDB_Services/test/CMakeLists.txt -text
 SAS/OTDB_Services/test/t_TreeService.py -text
 SAS/OTDB_Services/test/t_TreeService.run -text svneol=unset#application/x-shellscript
@@ -5017,7 +5018,6 @@ SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/rotspservice.ini
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/__init__.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py -text
-SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/otdbrpc.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py -text
diff --git a/SAS/OTDB_Services/CMakeLists.txt b/SAS/OTDB_Services/CMakeLists.txt
index 213dfd5368377bc5ffda74aec9aa561b754b7a73..bb1b514668a10f289fc9fcc2a365fce1893bad09 100644
--- a/SAS/OTDB_Services/CMakeLists.txt
+++ b/SAS/OTDB_Services/CMakeLists.txt
@@ -14,6 +14,7 @@ lofar_add_bin_scripts(
 
 set(_py_files
   config.py
+  otdbrpc.py
   OTDBBusListener.py
 )
 
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/otdbrpc.py b/SAS/OTDB_Services/otdbrpc.py
similarity index 100%
rename from SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/otdbrpc.py
rename to SAS/OTDB_Services/otdbrpc.py
diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py b/SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py
index 493317ec635a327a534d0a3e4a0a92f4c30f8230..863d3ea40d877ba7d3af30bf9a17f6000a35a007 100755
--- a/SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py
+++ b/SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py
@@ -29,7 +29,7 @@ from lofar.messaging import FromBus, ToBus, EventMessage # RPC,
 from lofar.parameterset import PyParameterValue
 from lofar.sas.otdb.OTDBBusListener import OTDBBusListener
 from lofar.common.util import waitForInterrupt
-from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_NOTIFICATION_BUSNAME, DEFAULT_OTDB_NOTIFICATION_SUBJECT
 from lofar.sas.resourceassignment.rataskspecified.config import DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME
 from lofar.sas.resourceassignment.rataskspecified.config import DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_SUBJECT
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt
index e652fe295b5fe6a754f5bf4adfa8bb2cd6c20c52..c2f60a22d1dad738cffdb80772a362fd0f8d2885 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
 
-lofar_package(RAtoOTDBTaskSpecificationPropagator 0.1 DEPENDS PyMessaging PyCommon pyparameterset)
+lofar_package(RAtoOTDBTaskSpecificationPropagator 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
 
 include(PythonInstall)
 set(USE_PYTHON_COMPILATION Off)
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt
index 7713a14080bb4ff22b0dd6f1b5120738aec341ed..fb4a42bf7a69daaeabb27146aea4f29d9ed298f1 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt
@@ -6,6 +6,5 @@ python_install(
     translator.py
     config.py
     propagator.py
-    otdbrpc.py
     DESTINATION lofar/sas/resourceassignment/ratootdbtaskspecificationpropagator)
 
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py
index 725f248142e515c3fe3b74fc949e9276573075c8..f004949d5102cf8dd0f8d408a1c6d672cff5bc12 100755
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py
@@ -36,7 +36,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RARPC as
 from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_BUSNAME as RADB_BUSNAME
 from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_SERVICENAME as RADB_SERVICENAME
 
-from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
 from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.translator import RAtoOTDBTranslator
 
diff --git a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
index e78a2d4035fd64feec25aa3ade452677df9e061b..1f76919118f14bb90c953c262c326cc70bc96caa 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
 
-lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset)
+lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
 
 include(PythonInstall)
 set(USE_PYTHON_COMPILATION Off)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
index 150d6541f8fef1d9ca02797bddb0c4e322009d71..7ff527088b1aa915ed0f8640a28e310541da4d67 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
@@ -40,7 +40,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAUL
 from lofar.sas.resourceassignment.resourceassignmentestimator.config import DEFAULT_BUSNAME as RE_BUSNAME
 from lofar.sas.resourceassignment.resourceassignmentestimator.config import DEFAULT_SERVICENAME as RE_SERVICENAME
 
-from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
 
 from lofar.sas.systemstatus.service.SSDBrpc import SSDBRPC