diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
index 8b2b46b038..35979af55f 100644
--- a/src/replica/CMakeLists.txt
+++ b/src/replica/CMakeLists.txt
@@ -10,7 +10,7 @@ target_sources(replica PRIVATE
     ${REPLICA_PB_SRCS}
     ${REPLICA_PB_HDRS}
     apps/AbortTransactionApp.cc
-    AbortTransactionJob.cc
+    jobs/AbortTransactionJob.cc
     qserv/AddReplicaQservMgtRequest.cc
     apps/AdminApp.cc
     apps/Application.cc
@@ -22,7 +22,7 @@ target_sources(replica PRIVATE
     ChunkedTable.cc
     apps/ChunksApp.cc
     apps/ClusterHealthApp.cc
-    ClusterHealthJob.cc
+    jobs/ClusterHealthJob.cc
     Common.cc
     apps/ConfigApp.cc
     apps/ConfigAppBase.cc
@@ -40,7 +40,7 @@ target_sources(replica PRIVATE
     config/ConfigurationSchema.cc
     Controller.cc
     apps/ControllerApp.cc
-    CreateReplicaJob.cc
+    jobs/CreateReplicaJob.cc
     Csv.cc
     mysql/DatabaseMySQL.cc
     mysql/DatabaseMySQLGenerator.cc
@@ -51,10 +51,10 @@ target_sources(replica PRIVATE
     database/DatabaseServicesMySQL.cc
     database/DatabaseServicesPool.cc
     apps/DatabaseTestApp.cc
-    DeleteReplicaJob.cc
+    jobs/DeleteReplicaJob.cc
     DeleteRequest.cc
     apps/DeleteWorkerApp.cc
-    DeleteWorkerJob.cc
+    jobs/DeleteWorkerJob.cc
     DeleteWorkerTask.cc
     DisposeRequest.cc
     EchoRequest.cc
@@ -70,11 +70,11 @@ target_sources(replica PRIVATE
     apps/FileServerApp.cc
     FileServerConnection.cc
     FileUtils.cc
-    FindAllJob.cc
+    jobs/FindAllJob.cc
     FindAllRequest.cc
     FindRequest.cc
     apps/FixUpApp.cc
-    FixUpJob.cc
+    jobs/FixUpJob.cc
     qserv/GetReplicasQservMgtRequest.cc
     qserv/GetDbStatusQservMgtRequest.cc
     qserv/GetConfigQservCzarMgtRequest.cc
@@ -107,7 +107,7 @@ target_sources(replica PRIVATE
     HttpSvc.cc
     HttpWorkerStatusModule.cc
     apps/DirectorIndexApp.cc
-    DirectorIndexJob.cc
+    jobs/DirectorIndexJob.cc
     DirectorIndexRequest.cc
     ingest/IngestClient.cc
     ingest/IngestFileSvc.cc
@@ -120,32 +120,32 @@ target_sources(replica PRIVATE
     ingest/IngestResourceMgrT.cc
     ingest/IngestSvc.cc
     ingest/IngestSvcConn.cc
-    Job.cc
+    jobs/Job.cc
     apps/MasterControllerHttpApp.cc
     Messenger.cc
     MessengerConnector.cc
     apps/MessengerTestApp.cc
     apps/MoveApp.cc
-    MoveReplicaJob.cc
+    jobs/MoveReplicaJob.cc
     apps/MySQLTestApp.cc
     Mutex.cc
     NamedMutexRegistry.cc
     Performance.cc
     ProtocolBuffer.cc
     apps/PurgeApp.cc
-    PurgeJob.cc
+    jobs/PurgeJob.cc
     apps/QhttpTestApp.cc
     qserv/QservCzarMgtRequest.cc
-    QservGetReplicasJob.cc
+    jobs/QservGetReplicasJob.cc
     qserv/QservMgtRequest.cc
     qserv/QservMgtServices.cc
-    QservStatusJob.cc
-    QservSyncJob.cc
+    jobs/QservStatusJob.cc
+    jobs/QservSyncJob.cc
     apps/QservWorkerApp.cc
     qserv/QservWorkerMgtRequest.cc
     apps/QservWorkerPingApp.cc
     apps/RebalanceApp.cc
-    RebalanceJob.cc
+    jobs/RebalanceJob.cc
     registry/Registry.cc
     apps/RegistryHttpApp.cc
     registry/RegistryHttpSvc.cc
@@ -154,53 +154,53 @@ target_sources(replica PRIVATE
     qserv/RemoveReplicaQservMgtRequest.cc
     ReplicaInfo.cc
     apps/ReplicateApp.cc
-    ReplicateJob.cc
+    jobs/ReplicateJob.cc
     ReplicationRequest.cc
     ReplicationTask.cc
     Request.cc
     RequestMessenger.cc
     RequestTracker.cc
-    ServiceManagementJob.cc
+    jobs/ServiceManagementJob.cc
     ServiceManagementRequest.cc
     ServiceManagementRequestBase.cc
     ServiceProvider.cc
     qserv/SetReplicasQservMgtRequest.cc
-    SqlAlterTablesJob.cc
+    jobs/SqlAlterTablesJob.cc
     SqlAlterTablesRequest.cc
     apps/SqlApp.cc
-    SqlCreateDbJob.cc
+    jobs/SqlCreateDbJob.cc
     SqlCreateDbRequest.cc
-    SqlCreateIndexesJob.cc
+    jobs/SqlCreateIndexesJob.cc
     SqlCreateIndexesRequest.cc
-    SqlCreateTableJob.cc
+    jobs/SqlCreateTableJob.cc
     SqlCreateTableRequest.cc
-    SqlCreateTablesJob.cc
+    jobs/SqlCreateTablesJob.cc
     SqlCreateTablesRequest.cc
-    SqlDeleteDbJob.cc
+    jobs/SqlDeleteDbJob.cc
     SqlDeleteDbRequest.cc
-    SqlDeleteTableJob.cc
-    SqlDeleteTablePartitionJob.cc
+    jobs/SqlDeleteTableJob.cc
+    jobs/SqlDeleteTablePartitionJob.cc
     SqlDeleteTablePartitionRequest.cc
     SqlDeleteTableRequest.cc
-    SqlDisableDbJob.cc
+    jobs/SqlDisableDbJob.cc
     SqlDisableDbRequest.cc
-    SqlDropIndexesJob.cc
+    jobs/SqlDropIndexesJob.cc
     SqlDropIndexesRequest.cc
-    SqlEnableDbJob.cc
+    jobs/SqlEnableDbJob.cc
     SqlEnableDbRequest.cc
-    SqlGetIndexesJob.cc
+    jobs/SqlGetIndexesJob.cc
     SqlGetIndexesRequest.cc
-    SqlGrantAccessJob.cc
+    jobs/SqlGrantAccessJob.cc
     SqlGrantAccessRequest.cc
-    SqlJob.cc
-    SqlJobResult.cc
-    SqlQueryJob.cc
+    jobs/SqlJob.cc
+    jobs/SqlJobResult.cc
+    jobs/SqlQueryJob.cc
     SqlQueryRequest.cc
-    SqlRemoveTablePartitionsJob.cc
+    jobs/SqlRemoveTablePartitionsJob.cc
     SqlRemoveTablePartitionsRequest.cc
     SqlRequest.cc
     SqlResultSet.cc
-    SqlRowStatsJob.cc
+    jobs/SqlRowStatsJob.cc
     SqlRowStatsRequest.cc
     SqlSchemaUtils.cc
     StatusRequest.cc
@@ -214,7 +214,7 @@ target_sources(replica PRIVATE
     database/TransactionContrib.cc
     apps/TransactionsApp.cc
     apps/VerifyApp.cc
-    VerifyJob.cc
+    jobs/VerifyJob.cc
     apps/WorkerApp.cc
     worker/WorkerDeleteRequest.cc
     worker/WorkerDirectorIndexRequest.cc
diff --git a/src/replica/DeleteWorkerTask.h b/src/replica/DeleteWorkerTask.h
index b970f6805d..3502470ba4 100644
--- a/src/replica/DeleteWorkerTask.h
+++ b/src/replica/DeleteWorkerTask.h
@@ -26,7 +26,7 @@
 #include <set>
 
 // Qserv headers
-#include "replica/DeleteWorkerJob.h"
+#include "replica/jobs/DeleteWorkerJob.h"
 #include "replica/Task.h"
 
 // This header declarations
diff --git a/src/replica/EventLogger.h b/src/replica/EventLogger.h
index 9ee64d57c2..8ddba5065f 100644
--- a/src/replica/EventLogger.h
+++ b/src/replica/EventLogger.h
@@ -27,7 +27,7 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 
 // Forward declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/HealthMonitorTask.h b/src/replica/HealthMonitorTask.h
index 6dc42880e5..3c47cbff2c 100644
--- a/src/replica/HealthMonitorTask.h
+++ b/src/replica/HealthMonitorTask.h
@@ -28,7 +28,7 @@
 #include <set>
 
 // Qserv headers
-#include "replica/ClusterHealthJob.h"
+#include "replica/jobs/ClusterHealthJob.h"
 #include "replica/Task.h"
 #include "replica/Mutex.h"
 
diff --git a/src/replica/HttpDirectorIndexModule.cc b/src/replica/HttpDirectorIndexModule.cc
index 3c1b2d170a..28d4f2fe99 100644
--- a/src/replica/HttpDirectorIndexModule.cc
+++ b/src/replica/HttpDirectorIndexModule.cc
@@ -27,7 +27,7 @@
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 #include "replica/ServiceProvider.h"
 
 using namespace std;
diff --git a/src/replica/HttpIngestModule.cc b/src/replica/HttpIngestModule.cc
index 0b673515b0..03f19467b2 100644
--- a/src/replica/HttpIngestModule.cc
+++ b/src/replica/HttpIngestModule.cc
@@ -45,19 +45,19 @@
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/FindAllJob.h"
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/QservSyncJob.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/ServiceProvider.h"
-#include "replica/SqlCreateDbJob.h"
-#include "replica/SqlCreateTableJob.h"
-#include "replica/SqlCreateTablesJob.h"
-#include "replica/SqlDeleteDbJob.h"
-#include "replica/SqlDeleteTableJob.h"
-#include "replica/SqlDisableDbJob.h"
-#include "replica/SqlGrantAccessJob.h"
-#include "replica/SqlEnableDbJob.h"
-#include "replica/SqlRemoveTablePartitionsJob.h"
+#include "replica/jobs/SqlCreateDbJob.h"
+#include "replica/jobs/SqlCreateTableJob.h"
+#include "replica/jobs/SqlCreateTablesJob.h"
+#include "replica/jobs/SqlDeleteDbJob.h"
+#include "replica/jobs/SqlDeleteTableJob.h"
+#include "replica/jobs/SqlDisableDbJob.h"
+#include "replica/jobs/SqlGrantAccessJob.h"
+#include "replica/jobs/SqlEnableDbJob.h"
+#include "replica/jobs/SqlRemoveTablePartitionsJob.h"
 #include "replica/SqlResultSet.h"
 
 // LSST headers
diff --git a/src/replica/HttpIngestModule.h b/src/replica/HttpIngestModule.h
index 2c60531c95..6c4ae54684 100644
--- a/src/replica/HttpIngestModule.h
+++ b/src/replica/HttpIngestModule.h
@@ -31,7 +31,7 @@
 // Qserv headers
 #include "replica/Common.h"
 #include "replica/HttpModule.h"
-#include "replica/SqlRowStatsJob.h"
+#include "replica/jobs/SqlRowStatsJob.h"
 
 // Forward declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/HttpIngestTransModule.cc b/src/replica/HttpIngestTransModule.cc
index 9696e20a73..b66b91987f 100644
--- a/src/replica/HttpIngestTransModule.cc
+++ b/src/replica/HttpIngestTransModule.cc
@@ -33,11 +33,11 @@
 
 // Qserv headers
 #include "http/Exceptions.h"
-#include "replica/AbortTransactionJob.h"
+#include "replica/jobs/AbortTransactionJob.h"
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 #include "replica/NamedMutexRegistry.h"
 #include "replica/ServiceProvider.h"
 #include "replica/Mutex.h"
diff --git a/src/replica/HttpModule.cc b/src/replica/HttpModule.cc
index 86b24af2a4..9c5bb38cda 100644
--- a/src/replica/HttpModule.cc
+++ b/src/replica/HttpModule.cc
@@ -30,7 +30,7 @@
 #include "replica/Controller.h"
 #include "replica/mysql/DatabaseMySQL.h"
 #include "replica/database/DatabaseServices.h"
-#include "replica/ServiceManagementJob.h"
+#include "replica/jobs/ServiceManagementJob.h"
 #include "replica/ServiceProvider.h"
 
 // LSST headers
diff --git a/src/replica/HttpQservMonitorModule.cc b/src/replica/HttpQservMonitorModule.cc
index 9f9673868b..7a2a013300 100644
--- a/src/replica/HttpQservMonitorModule.cc
+++ b/src/replica/HttpQservMonitorModule.cc
@@ -44,7 +44,7 @@
 #include "replica/config/ConfigDatabase.h"
 #include "replica/database/DatabaseServices.h"
 #include "replica/qserv/QservMgtServices.h"
-#include "replica/QservStatusJob.h"
+#include "replica/jobs/QservStatusJob.h"
 #include "replica/ServiceProvider.h"
 #include "util/String.h"
 #include "wbase/TaskState.h"
diff --git a/src/replica/HttpSqlIndexModule.cc b/src/replica/HttpSqlIndexModule.cc
index 3d9131c8a9..b4a20ef529 100644
--- a/src/replica/HttpSqlIndexModule.cc
+++ b/src/replica/HttpSqlIndexModule.cc
@@ -32,9 +32,9 @@
 #include "http/Exceptions.h"
 #include "http/RequestBody.h"
 #include "replica/config/Configuration.h"
-#include "replica/SqlCreateIndexesJob.h"
-#include "replica/SqlDropIndexesJob.h"
-#include "replica/SqlGetIndexesJob.h"
+#include "replica/jobs/SqlCreateIndexesJob.h"
+#include "replica/jobs/SqlDropIndexesJob.h"
+#include "replica/jobs/SqlGetIndexesJob.h"
 #include "replica/SqlResultSet.h"
 
 using namespace std;
diff --git a/src/replica/HttpSqlSchemaModule.cc b/src/replica/HttpSqlSchemaModule.cc
index b064cdc02c..42a25e5be6 100644
--- a/src/replica/HttpSqlSchemaModule.cc
+++ b/src/replica/HttpSqlSchemaModule.cc
@@ -34,7 +34,7 @@
 #include "http/Exceptions.h"
 #include "replica/config/Configuration.h"
 #include "replica/mysql/DatabaseMySQL.h"
-#include "replica/SqlAlterTablesJob.h"
+#include "replica/jobs/SqlAlterTablesJob.h"
 #include "replica/SqlResultSet.h"
 
 using namespace std;
diff --git a/src/replica/ReplicationTask.cc b/src/replica/ReplicationTask.cc
index dba98ba0c3..5a0f71378b 100644
--- a/src/replica/ReplicationTask.cc
+++ b/src/replica/ReplicationTask.cc
@@ -23,11 +23,11 @@
 #include "replica/ReplicationTask.h"
 
 // Qserv headers
-#include "replica/FindAllJob.h"
-#include "replica/FixUpJob.h"
-#include "replica/ReplicateJob.h"
-#include "replica/RebalanceJob.h"
-#include "replica/PurgeJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/FixUpJob.h"
+#include "replica/jobs/ReplicateJob.h"
+#include "replica/jobs/RebalanceJob.h"
+#include "replica/jobs/PurgeJob.h"
 
 using namespace std;
 
diff --git a/src/replica/Task.cc b/src/replica/Task.cc
index 669c234e11..0020610ed0 100644
--- a/src/replica/Task.cc
+++ b/src/replica/Task.cc
@@ -27,7 +27,7 @@
 #include <thread>
 
 // Qserv headers
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/QservSyncJob.h"
 #include "replica/ServiceProvider.h"
 #include "util/BlockPost.h"
 
diff --git a/src/replica/Task.h b/src/replica/Task.h
index 7037bdc263..e9f077c33f 100644
--- a/src/replica/Task.h
+++ b/src/replica/Task.h
@@ -31,7 +31,7 @@
 // Qserv headers
 #include "replica/Controller.h"
 #include "replica/EventLogger.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ServiceProvider.h"
 #include "util/BlockPost.h"
 #include "util/Issue.h"
diff --git a/src/replica/apps/AbortTransactionApp.cc b/src/replica/apps/AbortTransactionApp.cc
index 7263810201..f22e0ad405 100644
--- a/src/replica/apps/AbortTransactionApp.cc
+++ b/src/replica/apps/AbortTransactionApp.cc
@@ -29,9 +29,9 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/AbortTransactionJob.h"
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/AbortTransactionJob.h"
 #include "replica/ServiceProvider.h"
 
 using namespace std;
diff --git a/src/replica/apps/Application.cc b/src/replica/apps/Application.cc
index daab02f63e..12529d503f 100644
--- a/src/replica/apps/Application.cc
+++ b/src/replica/apps/Application.cc
@@ -29,7 +29,6 @@
 #include "replica/config/Configuration.h"
 #include "replica/config/ConfigParserMySQL.h"
 #include "replica/config/ConfigurationSchema.h"
-#include "replica/Job.h"
 #include "replica/protocol.pb.h"
 #include "util/Issue.h"
 
diff --git a/src/replica/apps/ChunksApp.cc b/src/replica/apps/ChunksApp.cc
index 0993dc71b3..9eebfbd9d3 100644
--- a/src/replica/apps/ChunksApp.cc
+++ b/src/replica/apps/ChunksApp.cc
@@ -31,8 +31,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/FindAllJob.h"
-#include "replica/QservGetReplicasJob.h"
+#include "replica/jobs/FindAllJob.h"
+#include "replica/jobs/QservGetReplicasJob.h"
 #include "replica/ReplicaInfo.h"
 #include "util/TablePrinter.h"
 
diff --git a/src/replica/apps/ClusterHealthApp.cc b/src/replica/apps/ClusterHealthApp.cc
index 9439811e1d..8d405dc3b4 100644
--- a/src/replica/apps/ClusterHealthApp.cc
+++ b/src/replica/apps/ClusterHealthApp.cc
@@ -29,7 +29,7 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/ClusterHealthJob.h"
+#include "replica/jobs/ClusterHealthJob.h"
 #include "util/TablePrinter.h"
 
 using namespace std;
diff --git a/src/replica/apps/DeleteWorkerApp.cc b/src/replica/apps/DeleteWorkerApp.cc
index 5f3633ac2d..4465e61027 100644
--- a/src/replica/apps/DeleteWorkerApp.cc
+++ b/src/replica/apps/DeleteWorkerApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/DeleteWorkerJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/DeleteWorkerJob.h"
 
 using namespace std;
 
diff --git a/src/replica/apps/DirectorIndexApp.cc b/src/replica/apps/DirectorIndexApp.cc
index f9ca57c428..358731e0bf 100644
--- a/src/replica/apps/DirectorIndexApp.cc
+++ b/src/replica/apps/DirectorIndexApp.cc
@@ -31,7 +31,7 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 #include "util/TablePrinter.h"
 
 using namespace std;
diff --git a/src/replica/apps/FixUpApp.cc b/src/replica/apps/FixUpApp.cc
index fbb3c6a6fb..6e2266a120 100644
--- a/src/replica/apps/FixUpApp.cc
+++ b/src/replica/apps/FixUpApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/FixUpJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/FixUpJob.h"
 
 using namespace std;
 
diff --git a/src/replica/apps/MoveApp.cc b/src/replica/apps/MoveApp.cc
index d457b8bdc4..e06a512c09 100644
--- a/src/replica/apps/MoveApp.cc
+++ b/src/replica/apps/MoveApp.cc
@@ -29,7 +29,7 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/MoveReplicaJob.h"
+#include "replica/jobs/MoveReplicaJob.h"
 #include "replica/ReplicaInfo.h"
 
 using namespace std;
diff --git a/src/replica/apps/PurgeApp.cc b/src/replica/apps/PurgeApp.cc
index cd9f851d75..1fa4953ed1 100644
--- a/src/replica/apps/PurgeApp.cc
+++ b/src/replica/apps/PurgeApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/PurgeJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/PurgeJob.h"
 
 using namespace std;
 
diff --git a/src/replica/apps/RebalanceApp.cc b/src/replica/apps/RebalanceApp.cc
index 076b3cfc47..a7a21e8b1c 100644
--- a/src/replica/apps/RebalanceApp.cc
+++ b/src/replica/apps/RebalanceApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/RebalanceJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/RebalanceJob.h"
 #include "util/TablePrinter.h"
 
 using namespace std;
diff --git a/src/replica/apps/ReplicateApp.cc b/src/replica/apps/ReplicateApp.cc
index 262aa52bc1..1c55a2cb4c 100644
--- a/src/replica/apps/ReplicateApp.cc
+++ b/src/replica/apps/ReplicateApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/ReplicateJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/ReplicateJob.h"
 
 using namespace std;
 
diff --git a/src/replica/apps/SqlApp.cc b/src/replica/apps/SqlApp.cc
index 5b6424ac69..f7cb584f1e 100644
--- a/src/replica/apps/SqlApp.cc
+++ b/src/replica/apps/SqlApp.cc
@@ -31,24 +31,24 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/SqlAlterTablesJob.h"
-#include "replica/SqlCreateDbJob.h"
-#include "replica/SqlCreateIndexesJob.h"
-#include "replica/SqlCreateTableJob.h"
-#include "replica/SqlCreateTablesJob.h"
-#include "replica/SqlDeleteDbJob.h"
-#include "replica/SqlDeleteTableJob.h"
-#include "replica/SqlDeleteTablePartitionJob.h"
-#include "replica/SqlDisableDbJob.h"
-#include "replica/SqlDropIndexesJob.h"
-#include "replica/SqlEnableDbJob.h"
-#include "replica/SqlGetIndexesJob.h"
-#include "replica/SqlGrantAccessJob.h"
-#include "replica/SqlJob.h"
-#include "replica/SqlQueryJob.h"
-#include "replica/SqlRemoveTablePartitionsJob.h"
+#include "replica/jobs/SqlAlterTablesJob.h"
+#include "replica/jobs/SqlCreateDbJob.h"
+#include "replica/jobs/SqlCreateIndexesJob.h"
+#include "replica/jobs/SqlCreateTableJob.h"
+#include "replica/jobs/SqlCreateTablesJob.h"
+#include "replica/jobs/SqlDeleteDbJob.h"
+#include "replica/jobs/SqlDeleteTableJob.h"
+#include "replica/jobs/SqlDeleteTablePartitionJob.h"
+#include "replica/jobs/SqlDisableDbJob.h"
+#include "replica/jobs/SqlDropIndexesJob.h"
+#include "replica/jobs/SqlEnableDbJob.h"
+#include "replica/jobs/SqlGetIndexesJob.h"
+#include "replica/jobs/SqlGrantAccessJob.h"
+#include "replica/jobs/SqlJob.h"
+#include "replica/jobs/SqlQueryJob.h"
+#include "replica/jobs/SqlRemoveTablePartitionsJob.h"
+#include "replica/jobs/SqlRowStatsJob.h"
 #include "replica/SqlResultSet.h"
-#include "replica/SqlRowStatsJob.h"
 #include "replica/SqlSchemaUtils.h"
 
 using namespace std;
diff --git a/src/replica/apps/SyncApp.cc b/src/replica/apps/SyncApp.cc
index cadf42f79f..a64004b75d 100644
--- a/src/replica/apps/SyncApp.cc
+++ b/src/replica/apps/SyncApp.cc
@@ -29,7 +29,7 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/QservSyncJob.h"
 #include "util/TablePrinter.h"
 
 using namespace std;
diff --git a/src/replica/apps/VerifyApp.cc b/src/replica/apps/VerifyApp.cc
index 809dca1444..db609915a5 100644
--- a/src/replica/apps/VerifyApp.cc
+++ b/src/replica/apps/VerifyApp.cc
@@ -30,8 +30,8 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/VerifyJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/VerifyJob.h"
 
 using namespace std;
 
diff --git a/src/replica/database/DatabaseServices.h b/src/replica/database/DatabaseServices.h
index deda1da591..79eee02c4c 100644
--- a/src/replica/database/DatabaseServices.h
+++ b/src/replica/database/DatabaseServices.h
@@ -39,7 +39,6 @@
 #include "replica/Common.h"
 #include "replica/Csv.h"
 #include "replica/database/TransactionContrib.h"
-#include "replica/Job.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/Mutex.h"
 
@@ -47,6 +46,7 @@
 namespace lsst::qserv::replica {
 class Configuration;
 class ControllerIdentity;
+class Job;
 class NamedMutexRegistry;
 class QservWorkerMgtRequest;
 class Performance;
diff --git a/src/replica/database/DatabaseServicesMySQL.cc b/src/replica/database/DatabaseServicesMySQL.cc
index 95c9a18284..fa98a72757 100644
--- a/src/replica/database/DatabaseServicesMySQL.cc
+++ b/src/replica/database/DatabaseServicesMySQL.cc
@@ -36,8 +36,8 @@
 #include "replica/Common.h"
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
+#include "replica/jobs/Job.h"
 #include "replica/mysql/DatabaseMySQLUtils.h"
-#include "replica/Job.h"
 #include "replica/NamedMutexRegistry.h"
 #include "replica/qserv/QservWorkerMgtRequest.h"
 #include "replica/ReplicaInfo.h"
diff --git a/src/replica/AbortTransactionJob.cc b/src/replica/jobs/AbortTransactionJob.cc
similarity index 99%
rename from src/replica/AbortTransactionJob.cc
rename to src/replica/jobs/AbortTransactionJob.cc
index 101db0cab5..627d7c807a 100644
--- a/src/replica/AbortTransactionJob.cc
+++ b/src/replica/jobs/AbortTransactionJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/AbortTransactionJob.h"
+#include "replica/jobs/AbortTransactionJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/AbortTransactionJob.h b/src/replica/jobs/AbortTransactionJob.h
similarity index 98%
rename from src/replica/AbortTransactionJob.h
rename to src/replica/jobs/AbortTransactionJob.h
index 5c51b30898..f19f2fb8db 100644
--- a/src/replica/AbortTransactionJob.h
+++ b/src/replica/jobs/AbortTransactionJob.h
@@ -30,8 +30,8 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/SqlDeleteTablePartitionJob.h"
-#include "replica/SqlJobResult.h"
+#include "replica/jobs/SqlDeleteTablePartitionJob.h"
+#include "replica/jobs/SqlJobResult.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/ClusterHealthJob.cc b/src/replica/jobs/ClusterHealthJob.cc
similarity index 99%
rename from src/replica/ClusterHealthJob.cc
rename to src/replica/jobs/ClusterHealthJob.cc
index 0c6056f431..4945d0dce8 100644
--- a/src/replica/ClusterHealthJob.cc
+++ b/src/replica/jobs/ClusterHealthJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ClusterHealthJob.h"
+#include "replica/jobs/ClusterHealthJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/ClusterHealthJob.h b/src/replica/jobs/ClusterHealthJob.h
similarity index 99%
rename from src/replica/ClusterHealthJob.h
rename to src/replica/jobs/ClusterHealthJob.h
index 76fc480767..429c933d39 100644
--- a/src/replica/ClusterHealthJob.h
+++ b/src/replica/jobs/ClusterHealthJob.h
@@ -28,7 +28,7 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ServiceManagementRequest.h"
 #include "replica/qserv/TestEchoQservMgtRequest.h"
 
diff --git a/src/replica/CreateReplicaJob.cc b/src/replica/jobs/CreateReplicaJob.cc
similarity index 99%
rename from src/replica/CreateReplicaJob.cc
rename to src/replica/jobs/CreateReplicaJob.cc
index c80745a38d..222fc05ecf 100644
--- a/src/replica/CreateReplicaJob.cc
+++ b/src/replica/jobs/CreateReplicaJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/CreateReplicaJob.h"
+#include "replica/jobs/CreateReplicaJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/CreateReplicaJob.h b/src/replica/jobs/CreateReplicaJob.h
similarity index 99%
rename from src/replica/CreateReplicaJob.h
rename to src/replica/jobs/CreateReplicaJob.h
index f8c4bc12d0..cc2d36dae3 100644
--- a/src/replica/CreateReplicaJob.h
+++ b/src/replica/jobs/CreateReplicaJob.h
@@ -30,7 +30,7 @@
 
 // Qserv headers
 #include "replica/qserv/AddReplicaQservMgtRequest.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/ReplicationRequest.h"
 
diff --git a/src/replica/DeleteReplicaJob.cc b/src/replica/jobs/DeleteReplicaJob.cc
similarity index 99%
rename from src/replica/DeleteReplicaJob.cc
rename to src/replica/jobs/DeleteReplicaJob.cc
index 8a3c7b9fdc..1fa3bd2ce7 100644
--- a/src/replica/DeleteReplicaJob.cc
+++ b/src/replica/jobs/DeleteReplicaJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/DeleteReplicaJob.h"
+#include "replica/jobs/DeleteReplicaJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/DeleteReplicaJob.h b/src/replica/jobs/DeleteReplicaJob.h
similarity index 99%
rename from src/replica/DeleteReplicaJob.h
rename to src/replica/jobs/DeleteReplicaJob.h
index a806218ef1..a69a4c6089 100644
--- a/src/replica/DeleteReplicaJob.h
+++ b/src/replica/jobs/DeleteReplicaJob.h
@@ -30,7 +30,7 @@
 
 // Qserv headers
 #include "replica/qserv/RemoveReplicaQservMgtRequest.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/DeleteRequest.h"
 
diff --git a/src/replica/DeleteWorkerJob.cc b/src/replica/jobs/DeleteWorkerJob.cc
similarity index 99%
rename from src/replica/DeleteWorkerJob.cc
rename to src/replica/jobs/DeleteWorkerJob.cc
index cc4f723cf1..a3e28f478c 100644
--- a/src/replica/DeleteWorkerJob.cc
+++ b/src/replica/jobs/DeleteWorkerJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/DeleteWorkerJob.h"
+#include "replica/jobs/DeleteWorkerJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/DeleteWorkerJob.h b/src/replica/jobs/DeleteWorkerJob.h
similarity index 99%
rename from src/replica/DeleteWorkerJob.h
rename to src/replica/jobs/DeleteWorkerJob.h
index d1344749e4..8d65a575c3 100644
--- a/src/replica/DeleteWorkerJob.h
+++ b/src/replica/jobs/DeleteWorkerJob.h
@@ -28,10 +28,10 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/ReplicateJob.h"
 #include "replica/FindAllRequest.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/ReplicateJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/DirectorIndexJob.cc b/src/replica/jobs/DirectorIndexJob.cc
similarity index 99%
rename from src/replica/DirectorIndexJob.cc
rename to src/replica/jobs/DirectorIndexJob.cc
index bd31ec3c8f..7a616d9f97 100644
--- a/src/replica/DirectorIndexJob.cc
+++ b/src/replica/jobs/DirectorIndexJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/DirectorIndexJob.h"
+#include "replica/jobs/DirectorIndexJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/DirectorIndexJob.h b/src/replica/jobs/DirectorIndexJob.h
similarity index 99%
rename from src/replica/DirectorIndexJob.h
rename to src/replica/jobs/DirectorIndexJob.h
index c22ed5e301..ca57b37cc1 100644
--- a/src/replica/DirectorIndexJob.h
+++ b/src/replica/jobs/DirectorIndexJob.h
@@ -38,7 +38,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/DirectorIndexRequest.h"
 
 // Forward declarations
diff --git a/src/replica/FindAllJob.cc b/src/replica/jobs/FindAllJob.cc
similarity index 99%
rename from src/replica/FindAllJob.cc
rename to src/replica/jobs/FindAllJob.cc
index 74add5adde..abd0eaebe9 100644
--- a/src/replica/FindAllJob.cc
+++ b/src/replica/jobs/FindAllJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/FindAllJob.h"
+#include "replica/jobs/FindAllJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/FindAllJob.h b/src/replica/jobs/FindAllJob.h
similarity index 99%
rename from src/replica/FindAllJob.h
rename to src/replica/jobs/FindAllJob.h
index 5d47cd192f..a99aecb46f 100644
--- a/src/replica/FindAllJob.h
+++ b/src/replica/jobs/FindAllJob.h
@@ -28,7 +28,7 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/FindAllRequest.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/SemanticMaps.h"
diff --git a/src/replica/FixUpJob.cc b/src/replica/jobs/FixUpJob.cc
similarity index 99%
rename from src/replica/FixUpJob.cc
rename to src/replica/jobs/FixUpJob.cc
index 3504e94a7d..dd76d92fa9 100644
--- a/src/replica/FixUpJob.cc
+++ b/src/replica/jobs/FixUpJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/FixUpJob.h"
+#include "replica/jobs/FixUpJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/FixUpJob.h b/src/replica/jobs/FixUpJob.h
similarity index 99%
rename from src/replica/FixUpJob.h
rename to src/replica/jobs/FixUpJob.h
index 402c9912f2..9285e9aec4 100644
--- a/src/replica/FixUpJob.h
+++ b/src/replica/jobs/FixUpJob.h
@@ -30,8 +30,8 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
-#include "replica/FindAllJob.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/FindAllJob.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/ReplicationRequest.h"
 
diff --git a/src/replica/Job.cc b/src/replica/jobs/Job.cc
similarity index 99%
rename from src/replica/Job.cc
rename to src/replica/jobs/Job.cc
index 0fbb2d6dc6..d94b8c24fe 100644
--- a/src/replica/Job.cc
+++ b/src/replica/jobs/Job.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 
 // System headers
 #include <functional>
diff --git a/src/replica/Job.h b/src/replica/jobs/Job.h
similarity index 100%
rename from src/replica/Job.h
rename to src/replica/jobs/Job.h
diff --git a/src/replica/MoveReplicaJob.cc b/src/replica/jobs/MoveReplicaJob.cc
similarity index 99%
rename from src/replica/MoveReplicaJob.cc
rename to src/replica/jobs/MoveReplicaJob.cc
index 4dca04e456..b072a150cc 100644
--- a/src/replica/MoveReplicaJob.cc
+++ b/src/replica/jobs/MoveReplicaJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/MoveReplicaJob.h"
+#include "replica/jobs/MoveReplicaJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/MoveReplicaJob.h b/src/replica/jobs/MoveReplicaJob.h
similarity index 98%
rename from src/replica/MoveReplicaJob.h
rename to src/replica/jobs/MoveReplicaJob.h
index dcc96f5db1..19c0ecc866 100644
--- a/src/replica/MoveReplicaJob.h
+++ b/src/replica/jobs/MoveReplicaJob.h
@@ -29,10 +29,10 @@
 #include <vector>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/CreateReplicaJob.h"
+#include "replica/jobs/DeleteReplicaJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/CreateReplicaJob.h"
-#include "replica/DeleteReplicaJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/PurgeJob.cc b/src/replica/jobs/PurgeJob.cc
similarity index 99%
rename from src/replica/PurgeJob.cc
rename to src/replica/jobs/PurgeJob.cc
index 616c2c0682..f1d85e981c 100644
--- a/src/replica/PurgeJob.cc
+++ b/src/replica/jobs/PurgeJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/PurgeJob.h"
+#include "replica/jobs/PurgeJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/PurgeJob.h b/src/replica/jobs/PurgeJob.h
similarity index 98%
rename from src/replica/PurgeJob.h
rename to src/replica/jobs/PurgeJob.h
index 07a4b40f2c..e8825708e4 100644
--- a/src/replica/PurgeJob.h
+++ b/src/replica/jobs/PurgeJob.h
@@ -30,8 +30,8 @@
 #include <string>
 
 // Qserv headers
-#include "replica/DeleteReplicaJob.h"
-#include "replica/FindAllJob.h"
+#include "replica/jobs/DeleteReplicaJob.h"
+#include "replica/jobs/FindAllJob.h"
 #include "replica/ReplicaInfo.h"
 
 // This header declarations
diff --git a/src/replica/QservGetReplicasJob.cc b/src/replica/jobs/QservGetReplicasJob.cc
similarity index 99%
rename from src/replica/QservGetReplicasJob.cc
rename to src/replica/jobs/QservGetReplicasJob.cc
index 0fd300bc17..25f491eed7 100644
--- a/src/replica/QservGetReplicasJob.cc
+++ b/src/replica/jobs/QservGetReplicasJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/QservGetReplicasJob.h"
+#include "replica/jobs/QservGetReplicasJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/QservGetReplicasJob.h b/src/replica/jobs/QservGetReplicasJob.h
similarity index 99%
rename from src/replica/QservGetReplicasJob.h
rename to src/replica/jobs/QservGetReplicasJob.h
index 7942ed51e6..efba3656e7 100644
--- a/src/replica/QservGetReplicasJob.h
+++ b/src/replica/jobs/QservGetReplicasJob.h
@@ -29,7 +29,7 @@
 
 // Qserv headers
 #include "replica/qserv/GetReplicasQservMgtRequest.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ReplicaInfo.h"
 #include "replica/SemanticMaps.h"
 
diff --git a/src/replica/QservStatusJob.cc b/src/replica/jobs/QservStatusJob.cc
similarity index 99%
rename from src/replica/QservStatusJob.cc
rename to src/replica/jobs/QservStatusJob.cc
index fe72aaf030..cbde925173 100644
--- a/src/replica/QservStatusJob.cc
+++ b/src/replica/jobs/QservStatusJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/QservStatusJob.h"
+#include "replica/jobs/QservStatusJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/QservStatusJob.h b/src/replica/jobs/QservStatusJob.h
similarity index 99%
rename from src/replica/QservStatusJob.h
rename to src/replica/jobs/QservStatusJob.h
index 17d891a5cc..b3711601c6 100644
--- a/src/replica/QservStatusJob.h
+++ b/src/replica/jobs/QservStatusJob.h
@@ -30,7 +30,7 @@
 #include "nlohmann/json.hpp"
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/qserv/GetStatusQservMgtRequest.h"
 #include "replica/ServiceManagementRequest.h"
 #include "wbase/TaskState.h"
diff --git a/src/replica/QservSyncJob.cc b/src/replica/jobs/QservSyncJob.cc
similarity index 99%
rename from src/replica/QservSyncJob.cc
rename to src/replica/jobs/QservSyncJob.cc
index 44986890cb..ea3c1d63e9 100644
--- a/src/replica/QservSyncJob.cc
+++ b/src/replica/jobs/QservSyncJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/QservSyncJob.h"
+#include "replica/jobs/QservSyncJob.h"
 
 // System headers
 #include <map>
diff --git a/src/replica/QservSyncJob.h b/src/replica/jobs/QservSyncJob.h
similarity index 99%
rename from src/replica/QservSyncJob.h
rename to src/replica/jobs/QservSyncJob.h
index e8c06939af..7c3d09bcff 100644
--- a/src/replica/QservSyncJob.h
+++ b/src/replica/jobs/QservSyncJob.h
@@ -28,7 +28,7 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/qserv/SetReplicasQservMgtRequest.h"
 
 // This header declarations
diff --git a/src/replica/RebalanceJob.cc b/src/replica/jobs/RebalanceJob.cc
similarity index 99%
rename from src/replica/RebalanceJob.cc
rename to src/replica/jobs/RebalanceJob.cc
index dc55477df2..95d84721d5 100644
--- a/src/replica/RebalanceJob.cc
+++ b/src/replica/jobs/RebalanceJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/RebalanceJob.h"
+#include "replica/jobs/RebalanceJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/RebalanceJob.h b/src/replica/jobs/RebalanceJob.h
similarity index 98%
rename from src/replica/RebalanceJob.h
rename to src/replica/jobs/RebalanceJob.h
index 31b939ad56..239db01ecd 100644
--- a/src/replica/RebalanceJob.h
+++ b/src/replica/jobs/RebalanceJob.h
@@ -28,10 +28,10 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
-#include "replica/FindAllJob.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/FindAllJob.h"
 #include "replica/ReplicaInfo.h"
-#include "replica/MoveReplicaJob.h"
+#include "replica/jobs/MoveReplicaJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/ReplicateJob.cc b/src/replica/jobs/ReplicateJob.cc
similarity index 99%
rename from src/replica/ReplicateJob.cc
rename to src/replica/jobs/ReplicateJob.cc
index 1a272526b3..568aa09dec 100644
--- a/src/replica/ReplicateJob.cc
+++ b/src/replica/jobs/ReplicateJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ReplicateJob.h"
+#include "replica/jobs/ReplicateJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/ReplicateJob.h b/src/replica/jobs/ReplicateJob.h
similarity index 98%
rename from src/replica/ReplicateJob.h
rename to src/replica/jobs/ReplicateJob.h
index 9bbda25147..2883e2cede 100644
--- a/src/replica/ReplicateJob.h
+++ b/src/replica/jobs/ReplicateJob.h
@@ -28,9 +28,9 @@
 #include <string>
 
 // Qserv headers
-#include "replica/CreateReplicaJob.h"
-#include "replica/Job.h"
-#include "replica/FindAllJob.h"
+#include "replica/jobs/CreateReplicaJob.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/FindAllJob.h"
 #include "replica/ReplicaInfo.h"
 
 // This header declarations
diff --git a/src/replica/ServiceManagementJob.cc b/src/replica/jobs/ServiceManagementJob.cc
similarity index 98%
rename from src/replica/ServiceManagementJob.cc
rename to src/replica/jobs/ServiceManagementJob.cc
index e7a1f124cd..ca6867ac73 100644
--- a/src/replica/ServiceManagementJob.cc
+++ b/src/replica/jobs/ServiceManagementJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/ServiceManagementJob.h"
+#include "replica/jobs/ServiceManagementJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/ServiceManagementJob.h b/src/replica/jobs/ServiceManagementJob.h
similarity index 99%
rename from src/replica/ServiceManagementJob.h
rename to src/replica/jobs/ServiceManagementJob.h
index 6d80b0be74..d20a2240b2 100644
--- a/src/replica/ServiceManagementJob.h
+++ b/src/replica/jobs/ServiceManagementJob.h
@@ -30,7 +30,7 @@
 // Qserv headers
 #include "replica/config/Configuration.h"
 #include "replica/Controller.h"
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/ServiceManagementRequest.h"
 #include "replica/ServiceProvider.h"
 
diff --git a/src/replica/SqlAlterTablesJob.cc b/src/replica/jobs/SqlAlterTablesJob.cc
similarity index 98%
rename from src/replica/SqlAlterTablesJob.cc
rename to src/replica/jobs/SqlAlterTablesJob.cc
index a66daa6073..227fc2a61b 100644
--- a/src/replica/SqlAlterTablesJob.cc
+++ b/src/replica/jobs/SqlAlterTablesJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlAlterTablesJob.h"
+#include "replica/jobs/SqlAlterTablesJob.h"
 
 // Qserv headers
 #include "replica/SqlAlterTablesRequest.h"
diff --git a/src/replica/SqlAlterTablesJob.h b/src/replica/jobs/SqlAlterTablesJob.h
similarity index 99%
rename from src/replica/SqlAlterTablesJob.h
rename to src/replica/jobs/SqlAlterTablesJob.h
index 45a16d90a8..f212e5b490 100644
--- a/src/replica/SqlAlterTablesJob.h
+++ b/src/replica/jobs/SqlAlterTablesJob.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlCreateDbJob.cc b/src/replica/jobs/SqlCreateDbJob.cc
similarity index 98%
rename from src/replica/SqlCreateDbJob.cc
rename to src/replica/jobs/SqlCreateDbJob.cc
index 1b8ef6b08c..c0c3d9a19c 100644
--- a/src/replica/SqlCreateDbJob.cc
+++ b/src/replica/jobs/SqlCreateDbJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlCreateDbJob.h"
+#include "replica/jobs/SqlCreateDbJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlCreateDbJob.h b/src/replica/jobs/SqlCreateDbJob.h
similarity index 99%
rename from src/replica/SqlCreateDbJob.h
rename to src/replica/jobs/SqlCreateDbJob.h
index afc5847fbc..a7c30f4fda 100644
--- a/src/replica/SqlCreateDbJob.h
+++ b/src/replica/jobs/SqlCreateDbJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlCreateIndexesJob.cc b/src/replica/jobs/SqlCreateIndexesJob.cc
similarity index 99%
rename from src/replica/SqlCreateIndexesJob.cc
rename to src/replica/jobs/SqlCreateIndexesJob.cc
index 224a4f89e0..e1ea2cead6 100644
--- a/src/replica/SqlCreateIndexesJob.cc
+++ b/src/replica/jobs/SqlCreateIndexesJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlCreateIndexesJob.h"
+#include "replica/jobs/SqlCreateIndexesJob.h"
 
 // Qserv headers
 #include "replica/SqlCreateIndexesRequest.h"
diff --git a/src/replica/SqlCreateIndexesJob.h b/src/replica/jobs/SqlCreateIndexesJob.h
similarity index 99%
rename from src/replica/SqlCreateIndexesJob.h
rename to src/replica/jobs/SqlCreateIndexesJob.h
index 43ceee13b6..db9453fe11 100644
--- a/src/replica/SqlCreateIndexesJob.h
+++ b/src/replica/jobs/SqlCreateIndexesJob.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlCreateTableJob.cc b/src/replica/jobs/SqlCreateTableJob.cc
similarity index 99%
rename from src/replica/SqlCreateTableJob.cc
rename to src/replica/jobs/SqlCreateTableJob.cc
index 94722a4bbc..1a5a90f6b6 100644
--- a/src/replica/SqlCreateTableJob.cc
+++ b/src/replica/jobs/SqlCreateTableJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlCreateTableJob.h"
+#include "replica/jobs/SqlCreateTableJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlCreateTableJob.h b/src/replica/jobs/SqlCreateTableJob.h
similarity index 99%
rename from src/replica/SqlCreateTableJob.h
rename to src/replica/jobs/SqlCreateTableJob.h
index e899b0a524..b76062f176 100644
--- a/src/replica/SqlCreateTableJob.h
+++ b/src/replica/jobs/SqlCreateTableJob.h
@@ -30,7 +30,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlCreateTablesJob.cc b/src/replica/jobs/SqlCreateTablesJob.cc
similarity index 99%
rename from src/replica/SqlCreateTablesJob.cc
rename to src/replica/jobs/SqlCreateTablesJob.cc
index aa3bb78e24..0eb4594955 100644
--- a/src/replica/SqlCreateTablesJob.cc
+++ b/src/replica/jobs/SqlCreateTablesJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlCreateTablesJob.h"
+#include "replica/jobs/SqlCreateTablesJob.h"
 
 // Qserv headers
 #include "replica/SqlCreateTablesRequest.h"
diff --git a/src/replica/SqlCreateTablesJob.h b/src/replica/jobs/SqlCreateTablesJob.h
similarity index 99%
rename from src/replica/SqlCreateTablesJob.h
rename to src/replica/jobs/SqlCreateTablesJob.h
index 7cc29059ad..7849778ebc 100644
--- a/src/replica/SqlCreateTablesJob.h
+++ b/src/replica/jobs/SqlCreateTablesJob.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlDeleteDbJob.cc b/src/replica/jobs/SqlDeleteDbJob.cc
similarity index 98%
rename from src/replica/SqlDeleteDbJob.cc
rename to src/replica/jobs/SqlDeleteDbJob.cc
index ea01c6e932..0b6d1000e8 100644
--- a/src/replica/SqlDeleteDbJob.cc
+++ b/src/replica/jobs/SqlDeleteDbJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlDeleteDbJob.h"
+#include "replica/jobs/SqlDeleteDbJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlDeleteDbJob.h b/src/replica/jobs/SqlDeleteDbJob.h
similarity index 99%
rename from src/replica/SqlDeleteDbJob.h
rename to src/replica/jobs/SqlDeleteDbJob.h
index 15fe550b27..a827d9f6fc 100644
--- a/src/replica/SqlDeleteDbJob.h
+++ b/src/replica/jobs/SqlDeleteDbJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlDeleteTableJob.cc b/src/replica/jobs/SqlDeleteTableJob.cc
similarity index 98%
rename from src/replica/SqlDeleteTableJob.cc
rename to src/replica/jobs/SqlDeleteTableJob.cc
index f520c4b9df..849771dc82 100644
--- a/src/replica/SqlDeleteTableJob.cc
+++ b/src/replica/jobs/SqlDeleteTableJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlDeleteTableJob.h"
+#include "replica/jobs/SqlDeleteTableJob.h"
 
 // System headers
 #include <vector>
diff --git a/src/replica/SqlDeleteTableJob.h b/src/replica/jobs/SqlDeleteTableJob.h
similarity index 99%
rename from src/replica/SqlDeleteTableJob.h
rename to src/replica/jobs/SqlDeleteTableJob.h
index a5d2f2e206..73a1cfe2d0 100644
--- a/src/replica/SqlDeleteTableJob.h
+++ b/src/replica/jobs/SqlDeleteTableJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlDeleteTablePartitionJob.cc b/src/replica/jobs/SqlDeleteTablePartitionJob.cc
similarity index 99%
rename from src/replica/SqlDeleteTablePartitionJob.cc
rename to src/replica/jobs/SqlDeleteTablePartitionJob.cc
index 783867de4f..f676ac5894 100644
--- a/src/replica/SqlDeleteTablePartitionJob.cc
+++ b/src/replica/jobs/SqlDeleteTablePartitionJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlDeleteTablePartitionJob.h"
+#include "replica/jobs/SqlDeleteTablePartitionJob.h"
 
 // Qserv headers
 #include "replica/Controller.h"
diff --git a/src/replica/SqlDeleteTablePartitionJob.h b/src/replica/jobs/SqlDeleteTablePartitionJob.h
similarity index 99%
rename from src/replica/SqlDeleteTablePartitionJob.h
rename to src/replica/jobs/SqlDeleteTablePartitionJob.h
index 7768090fc3..110f429222 100644
--- a/src/replica/SqlDeleteTablePartitionJob.h
+++ b/src/replica/jobs/SqlDeleteTablePartitionJob.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlDisableDbJob.cc b/src/replica/jobs/SqlDisableDbJob.cc
similarity index 98%
rename from src/replica/SqlDisableDbJob.cc
rename to src/replica/jobs/SqlDisableDbJob.cc
index 731ee3c4ac..f9a95c9ecf 100644
--- a/src/replica/SqlDisableDbJob.cc
+++ b/src/replica/jobs/SqlDisableDbJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlDisableDbJob.h"
+#include "replica/jobs/SqlDisableDbJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlDisableDbJob.h b/src/replica/jobs/SqlDisableDbJob.h
similarity index 99%
rename from src/replica/SqlDisableDbJob.h
rename to src/replica/jobs/SqlDisableDbJob.h
index 27f4eb5d10..1b473fbab3 100644
--- a/src/replica/SqlDisableDbJob.h
+++ b/src/replica/jobs/SqlDisableDbJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlDropIndexesJob.cc b/src/replica/jobs/SqlDropIndexesJob.cc
similarity index 99%
rename from src/replica/SqlDropIndexesJob.cc
rename to src/replica/jobs/SqlDropIndexesJob.cc
index 64711f77c6..cb6268af52 100644
--- a/src/replica/SqlDropIndexesJob.cc
+++ b/src/replica/jobs/SqlDropIndexesJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlDropIndexesJob.h"
+#include "replica/jobs/SqlDropIndexesJob.h"
 
 // Qserv headers
 #include "replica/SqlDropIndexesRequest.h"
diff --git a/src/replica/SqlDropIndexesJob.h b/src/replica/jobs/SqlDropIndexesJob.h
similarity index 99%
rename from src/replica/SqlDropIndexesJob.h
rename to src/replica/jobs/SqlDropIndexesJob.h
index 9f3319f6f8..57897efab8 100644
--- a/src/replica/SqlDropIndexesJob.h
+++ b/src/replica/jobs/SqlDropIndexesJob.h
@@ -31,7 +31,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlEnableDbJob.cc b/src/replica/jobs/SqlEnableDbJob.cc
similarity index 98%
rename from src/replica/SqlEnableDbJob.cc
rename to src/replica/jobs/SqlEnableDbJob.cc
index e7b4b729fc..b755531f20 100644
--- a/src/replica/SqlEnableDbJob.cc
+++ b/src/replica/jobs/SqlEnableDbJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlEnableDbJob.h"
+#include "replica/jobs/SqlEnableDbJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlEnableDbJob.h b/src/replica/jobs/SqlEnableDbJob.h
similarity index 99%
rename from src/replica/SqlEnableDbJob.h
rename to src/replica/jobs/SqlEnableDbJob.h
index 7ea81ea7e8..b545de3fb7 100644
--- a/src/replica/SqlEnableDbJob.h
+++ b/src/replica/jobs/SqlEnableDbJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlGetIndexesJob.cc b/src/replica/jobs/SqlGetIndexesJob.cc
similarity index 99%
rename from src/replica/SqlGetIndexesJob.cc
rename to src/replica/jobs/SqlGetIndexesJob.cc
index 79934e5ab7..b9e3beface 100644
--- a/src/replica/SqlGetIndexesJob.cc
+++ b/src/replica/jobs/SqlGetIndexesJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlGetIndexesJob.h"
+#include "replica/jobs/SqlGetIndexesJob.h"
 
 // Qserv headers
 #include "replica/SqlGetIndexesRequest.h"
diff --git a/src/replica/SqlGetIndexesJob.h b/src/replica/jobs/SqlGetIndexesJob.h
similarity index 99%
rename from src/replica/SqlGetIndexesJob.h
rename to src/replica/jobs/SqlGetIndexesJob.h
index 7753689f32..33911e1ab5 100644
--- a/src/replica/SqlGetIndexesJob.h
+++ b/src/replica/jobs/SqlGetIndexesJob.h
@@ -32,7 +32,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // Third party headers
 #include "nlohmann/json.hpp"
diff --git a/src/replica/SqlGrantAccessJob.cc b/src/replica/jobs/SqlGrantAccessJob.cc
similarity index 98%
rename from src/replica/SqlGrantAccessJob.cc
rename to src/replica/jobs/SqlGrantAccessJob.cc
index 53e5503f26..926a99e455 100644
--- a/src/replica/SqlGrantAccessJob.cc
+++ b/src/replica/jobs/SqlGrantAccessJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlGrantAccessJob.h"
+#include "replica/jobs/SqlGrantAccessJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlGrantAccessJob.h b/src/replica/jobs/SqlGrantAccessJob.h
similarity index 99%
rename from src/replica/SqlGrantAccessJob.h
rename to src/replica/jobs/SqlGrantAccessJob.h
index cd432c4ab7..19b71dba25 100644
--- a/src/replica/SqlGrantAccessJob.h
+++ b/src/replica/jobs/SqlGrantAccessJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlJob.cc b/src/replica/jobs/SqlJob.cc
similarity index 99%
rename from src/replica/SqlJob.cc
rename to src/replica/jobs/SqlJob.cc
index 494854fb9b..2aff7e3708 100644
--- a/src/replica/SqlJob.cc
+++ b/src/replica/jobs/SqlJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlJob.h b/src/replica/jobs/SqlJob.h
similarity index 99%
rename from src/replica/SqlJob.h
rename to src/replica/jobs/SqlJob.h
index 82e80e959a..4475e89e36 100644
--- a/src/replica/SqlJob.h
+++ b/src/replica/jobs/SqlJob.h
@@ -34,8 +34,8 @@
 
 // Qserv headers
 #include "replica/Controller.h"
-#include "replica/Job.h"
-#include "replica/SqlJobResult.h"
+#include "replica/jobs/Job.h"
+#include "replica/jobs/SqlJobResult.h"
 #include "replica/SqlRequest.h"
 
 // This header declarations
diff --git a/src/replica/SqlJobResult.cc b/src/replica/jobs/SqlJobResult.cc
similarity index 99%
rename from src/replica/SqlJobResult.cc
rename to src/replica/jobs/SqlJobResult.cc
index a93b45ff3c..2a1dc3fe40 100644
--- a/src/replica/SqlJobResult.cc
+++ b/src/replica/jobs/SqlJobResult.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlJobResult.h"
+#include "replica/jobs/SqlJobResult.h"
 
 // Qserv headers
 #include "replica/Common.h"
diff --git a/src/replica/SqlJobResult.h b/src/replica/jobs/SqlJobResult.h
similarity index 100%
rename from src/replica/SqlJobResult.h
rename to src/replica/jobs/SqlJobResult.h
diff --git a/src/replica/SqlQueryJob.cc b/src/replica/jobs/SqlQueryJob.cc
similarity index 99%
rename from src/replica/SqlQueryJob.cc
rename to src/replica/jobs/SqlQueryJob.cc
index a54b88198b..f8743d8ab9 100644
--- a/src/replica/SqlQueryJob.cc
+++ b/src/replica/jobs/SqlQueryJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlQueryJob.h"
+#include "replica/jobs/SqlQueryJob.h"
 
 // System headers
 #include <algorithm>
diff --git a/src/replica/SqlQueryJob.h b/src/replica/jobs/SqlQueryJob.h
similarity index 99%
rename from src/replica/SqlQueryJob.h
rename to src/replica/jobs/SqlQueryJob.h
index f0a89cd954..1764c72599 100644
--- a/src/replica/SqlQueryJob.h
+++ b/src/replica/jobs/SqlQueryJob.h
@@ -30,7 +30,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlRemoveTablePartitionsJob.cc b/src/replica/jobs/SqlRemoveTablePartitionsJob.cc
similarity index 98%
rename from src/replica/SqlRemoveTablePartitionsJob.cc
rename to src/replica/jobs/SqlRemoveTablePartitionsJob.cc
index 479c502fd6..d2fdcc73eb 100644
--- a/src/replica/SqlRemoveTablePartitionsJob.cc
+++ b/src/replica/jobs/SqlRemoveTablePartitionsJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/SqlRemoveTablePartitionsJob.h"
+#include "replica/jobs/SqlRemoveTablePartitionsJob.h"
 
 // Qserv headers
 #include "replica/SqlRemoveTablePartitionsRequest.h"
diff --git a/src/replica/SqlRemoveTablePartitionsJob.h b/src/replica/jobs/SqlRemoveTablePartitionsJob.h
similarity index 99%
rename from src/replica/SqlRemoveTablePartitionsJob.h
rename to src/replica/jobs/SqlRemoveTablePartitionsJob.h
index 3b652a439d..dd65364c48 100644
--- a/src/replica/SqlRemoveTablePartitionsJob.h
+++ b/src/replica/jobs/SqlRemoveTablePartitionsJob.h
@@ -29,7 +29,7 @@
 #include <tuple>
 
 // Qserv headers
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/SqlRowStatsJob.cc b/src/replica/jobs/SqlRowStatsJob.cc
similarity index 99%
rename from src/replica/SqlRowStatsJob.cc
rename to src/replica/jobs/SqlRowStatsJob.cc
index 0b2ab78b2b..e7571e1362 100644
--- a/src/replica/SqlRowStatsJob.cc
+++ b/src/replica/jobs/SqlRowStatsJob.cc
@@ -20,13 +20,13 @@
  */
 
 // Class header
-#include "replica/SqlRowStatsJob.h"
+#include "replica/jobs/SqlRowStatsJob.h"
 
 // Qserv headers
 #include "global/constants.h"
 #include "global/stringUtil.h"
 #include "replica/ChunkedTable.h"
-#include "replica/SqlJobResult.h"
+#include "replica/jobs/SqlJobResult.h"
 #include "replica/SqlRowStatsRequest.h"
 #include "replica/StopRequest.h"
 #include "util/TimeUtils.h"
diff --git a/src/replica/SqlRowStatsJob.h b/src/replica/jobs/SqlRowStatsJob.h
similarity index 99%
rename from src/replica/SqlRowStatsJob.h
rename to src/replica/jobs/SqlRowStatsJob.h
index 49589917b9..6f81cddacb 100644
--- a/src/replica/SqlRowStatsJob.h
+++ b/src/replica/jobs/SqlRowStatsJob.h
@@ -32,7 +32,7 @@
 
 // Qserv headers
 #include "replica/Common.h"
-#include "replica/SqlJob.h"
+#include "replica/jobs/SqlJob.h"
 
 // This header declarations
 namespace lsst::qserv::replica {
diff --git a/src/replica/VerifyJob.cc b/src/replica/jobs/VerifyJob.cc
similarity index 99%
rename from src/replica/VerifyJob.cc
rename to src/replica/jobs/VerifyJob.cc
index 7fc6d149c2..59fafe5a9f 100644
--- a/src/replica/VerifyJob.cc
+++ b/src/replica/jobs/VerifyJob.cc
@@ -20,7 +20,7 @@
  */
 
 // Class header
-#include "replica/VerifyJob.h"
+#include "replica/jobs/VerifyJob.h"
 
 // System headers
 #include <stdexcept>
diff --git a/src/replica/VerifyJob.h b/src/replica/jobs/VerifyJob.h
similarity index 99%
rename from src/replica/VerifyJob.h
rename to src/replica/jobs/VerifyJob.h
index 7edf4b4490..505fe9dd79 100644
--- a/src/replica/VerifyJob.h
+++ b/src/replica/jobs/VerifyJob.h
@@ -26,7 +26,7 @@
 #include <string>
 
 // Qserv headers
-#include "replica/Job.h"
+#include "replica/jobs/Job.h"
 #include "replica/FindRequest.h"
 
 // This header declarations