diff --git a/.gitattributes b/.gitattributes
index 92513a672f82e91cf09f05cc25690b64bb1d3d74..eb9cb71f0da12155ae0a99c9d6797e0e1e49c15a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4959,19 +4959,19 @@ SAS/OTDB_Services/test/t_TreeStatusEvents.run -text svneol=unset#application/x-s
 SAS/OTDB_Services/test/t_TreeStatusEvents.sh -text svneol=unset#application/x-shellscript
 SAS/OTDB_Services/test/unittest_db.dump.gz -text svneol=unset#application/x-gzip
 SAS/ResourceAssignment/CMakeLists.txt -text
-SAS/ResourceAssignment/QPIDDatabase/README -text
-SAS/ResourceAssignment/QPIDDatabase/bin/addtoQPIDDB.py -text
-SAS/ResourceAssignment/QPIDDatabase/bin/cep4_config.sh -text
-SAS/ResourceAssignment/QPIDDatabase/bin/compareQPIDwithDB.py -text
-SAS/ResourceAssignment/QPIDDatabase/bin/configQPIDfromDB.py -text
-SAS/ResourceAssignment/QPIDDatabase/bin/gatherfrombrokers.sh -text
-SAS/ResourceAssignment/QPIDDatabase/bin/qpidinfra_dump.sql -text
-SAS/ResourceAssignment/QPIDDatabase/bin/route_to_struct.py -text
-SAS/ResourceAssignment/QPIDDatabase/lib/QPIDDB.py -text
-SAS/ResourceAssignment/QPIDDatabase/lib/__init__.py -text
-SAS/ResourceAssignment/QPIDDatabase/lib/psqlQPIDDB.py -text
-SAS/ResourceAssignment/QPIDDatabase/sql/qpidinfradb.sql -text
-SAS/ResourceAssignment/QPIDDatabase/test/test_qpid_database.sh -text
+SAS/ResourceAssignment/QPIDInfrastructure/README -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/cep4_config.sh -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql -text
+SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql -text
+SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/__init__.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py -text
diff --git a/SAS/ResourceAssignment/QPIDDatabase/README b/SAS/ResourceAssignment/QPIDInfrastructure/README
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/README
rename to SAS/ResourceAssignment/QPIDInfrastructure/README
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/addtoQPIDDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/addtoQPIDDB.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/cep4_config.sh b/SAS/ResourceAssignment/QPIDInfrastructure/bin/cep4_config.sh
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/cep4_config.sh
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/cep4_config.sh
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/compareQPIDwithDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/compareQPIDwithDB.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/configQPIDfromDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/configQPIDfromDB.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/gatherfrombrokers.sh b/SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/gatherfrombrokers.sh
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/qpidinfra_dump.sql b/SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/qpidinfra_dump.sql
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql
diff --git a/SAS/ResourceAssignment/QPIDDatabase/bin/route_to_struct.py b/SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/bin/route_to_struct.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/lib/QPIDDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/lib/QPIDDB.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/lib/__init__.py b/SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/lib/__init__.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/lib/psqlQPIDDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/lib/psqlQPIDDB.py
rename to SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDDatabase/sql/qpidinfradb.sql b/SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/sql/qpidinfradb.sql
rename to SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql
diff --git a/SAS/ResourceAssignment/QPIDDatabase/test/test_qpid_database.sh b/SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh
similarity index 100%
rename from SAS/ResourceAssignment/QPIDDatabase/test/test_qpid_database.sh
rename to SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh