diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 6e5c76abb95976fcb1db83af26994052fe8e3caf..22e54c81043210f1e78fea31e7d873fb8e45990e 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -10,24 +10,35 @@ set (COMMON_LIB_SRC_FILES
   archiveNS/ArchiveDirEntry.cpp
   archiveNS/ArchiveDirIterator.cpp
   archiveNS/ArchiveFileStatus.cpp
+  archiveNS/StorageClass.cpp
+  archiveNS/Tape.cpp
+  archiveNS/TapeCopyLocation.cpp
   archiveNS/TapeCopyLocationAndStatus.cpp
   CreationLog.cpp
   checksum/ByteArray.cpp
   checksum/Checksum.cpp
   exception/Backtrace.cpp
+  exception/DiskException.hpp
   exception/Errnum.cpp
   exception/Exception.cpp
   exception/Serrnum.cpp
+  exception/TapeException.cpp
+  priorities/DriveQuota.cpp
+  priorities/MountCriteria.cpp
+  priorities/UserGroup.cpp
   remoteFS/RemoteFileStatus.cpp
   remoteFS/RemotePath.cpp
   remoteFS/RemotePathAndStatus.cpp
+  SecurityIdentity.cpp
   strerror_r_wrapper.cpp
+  TapePool.cpp
   Timer.cpp
   threading/ChildProcess.cpp
   threading/Mutex.cpp
   threading/Threading.cpp
   UserIdentity.cpp
-  Utils.cpp)
+  Utils.cpp
+  VO.cpp)
 
 add_library (ctacommon SHARED
   ${COMMON_LIB_SRC_FILES})
@@ -42,6 +53,7 @@ set (COMMON_UNIT_TESTS_LIB_SRC_FILES
   checksum/ByteArrayTest.cpp
   checksum/ChecksumTest.cpp
   remoteFS/RemotePathTest.cpp
+  UserIdentityTest.cpp
   UtilsTest.cpp)
 
 add_library (ctacommonunittests SHARED
diff --git a/scheduler/SecurityIdentity.cpp b/common/SecurityIdentity.cpp
similarity index 97%
rename from scheduler/SecurityIdentity.cpp
rename to common/SecurityIdentity.cpp
index 196c92c4fd26153b42eba0fb64221ebfe427a838..77ecc733ef56cf88bdd0b317e9dc0274e9c81c58 100644
--- a/scheduler/SecurityIdentity.cpp
+++ b/common/SecurityIdentity.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/SecurityIdentity.hpp b/common/SecurityIdentity.hpp
similarity index 100%
rename from scheduler/SecurityIdentity.hpp
rename to common/SecurityIdentity.hpp
diff --git a/scheduler/TapePool.cpp b/common/TapePool.cpp
similarity index 98%
rename from scheduler/TapePool.cpp
rename to common/TapePool.cpp
index dc763b9ae758a54cf59e47de6ab0d7e56ae130e9..efd0b846ac23e0b974ec728cbeecb327c0d89551 100644
--- a/scheduler/TapePool.cpp
+++ b/common/TapePool.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapePool.hpp"
+#include "common/TapePool.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapePool.hpp b/common/TapePool.hpp
similarity index 100%
rename from scheduler/TapePool.hpp
rename to common/TapePool.hpp
diff --git a/scheduler/UserIdentityTest.cpp b/common/UserIdentityTest.cpp
similarity index 100%
rename from scheduler/UserIdentityTest.cpp
rename to common/UserIdentityTest.cpp
diff --git a/scheduler/VO.cpp b/common/VO.cpp
similarity index 98%
rename from scheduler/VO.cpp
rename to common/VO.cpp
index 24b592c3220a9e1395f9fec78ab981796c709add..1b31fd3de091d7641e11ae95e17fe8faf368d916 100644
--- a/scheduler/VO.cpp
+++ b/common/VO.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/VO.hpp"
+#include "common/VO.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/VO.hpp b/common/VO.hpp
similarity index 100%
rename from scheduler/VO.hpp
rename to common/VO.hpp
diff --git a/scheduler/StorageClass.cpp b/common/archiveNS/StorageClass.cpp
similarity index 97%
rename from scheduler/StorageClass.cpp
rename to common/archiveNS/StorageClass.cpp
index 6fccfd0eaab8c7ef885bbeb56215fe484b4398e2..1bd77e3efd8ae3c78610e09a94ada0ad8a2c4c86 100644
--- a/scheduler/StorageClass.cpp
+++ b/common/archiveNS/StorageClass.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "common/CreationLog.hpp"
 
 //------------------------------------------------------------------------------
diff --git a/scheduler/StorageClass.hpp b/common/archiveNS/StorageClass.hpp
similarity index 100%
rename from scheduler/StorageClass.hpp
rename to common/archiveNS/StorageClass.hpp
diff --git a/scheduler/Tape.cpp b/common/archiveNS/Tape.cpp
similarity index 98%
rename from scheduler/Tape.cpp
rename to common/archiveNS/Tape.cpp
index 36fe0c8f7e9a94e7b8db9bb0cf3e98b2fe922e9a..6109935f3bfc86a6c552db78c88bcb5213977f3c 100644
--- a/scheduler/Tape.cpp
+++ b/common/archiveNS/Tape.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/Tape.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/Tape.hpp b/common/archiveNS/Tape.hpp
similarity index 100%
rename from scheduler/Tape.hpp
rename to common/archiveNS/Tape.hpp
diff --git a/scheduler/TapeCopyLocation.cpp b/common/archiveNS/TapeCopyLocation.cpp
similarity index 96%
rename from scheduler/TapeCopyLocation.cpp
rename to common/archiveNS/TapeCopyLocation.cpp
index 3b29d19ded9f0310130107739a376feaf48f2eef..064f852960e85f4738acecbab0e075c4f21a24d4 100644
--- a/scheduler/TapeCopyLocation.cpp
+++ b/common/archiveNS/TapeCopyLocation.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapeCopyLocation.hpp b/common/archiveNS/TapeCopyLocation.hpp
similarity index 100%
rename from scheduler/TapeCopyLocation.hpp
rename to common/archiveNS/TapeCopyLocation.hpp
diff --git a/scheduler/DiskException.cpp b/common/exception/DiskException.cpp
similarity index 100%
rename from scheduler/DiskException.cpp
rename to common/exception/DiskException.cpp
diff --git a/scheduler/DiskException.hpp b/common/exception/DiskException.hpp
similarity index 100%
rename from scheduler/DiskException.hpp
rename to common/exception/DiskException.hpp
diff --git a/scheduler/TapeException.cpp b/common/exception/TapeException.cpp
similarity index 96%
rename from scheduler/TapeException.cpp
rename to common/exception/TapeException.cpp
index 324472d3c526de2a63cff39f95ffcf9e8ba10edc..3967f4c35c52e4138eb06e22301b01c89eb8aa49 100644
--- a/scheduler/TapeException.cpp
+++ b/common/exception/TapeException.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/TapeException.hpp"
+#include "common/exception/TapeException.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/TapeException.hpp b/common/exception/TapeException.hpp
similarity index 100%
rename from scheduler/TapeException.hpp
rename to common/exception/TapeException.hpp
diff --git a/scheduler/DriveQuota.cpp b/common/priorities/DriveQuota.cpp
similarity index 97%
rename from scheduler/DriveQuota.cpp
rename to common/priorities/DriveQuota.cpp
index 7906927891c991fd789ed3fe8a292d7733f3f2c9..0dddd23bdc57a1347d395ab3b9c087209386e5f5 100644
--- a/scheduler/DriveQuota.cpp
+++ b/common/priorities/DriveQuota.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/DriveQuota.hpp"
+#include "common/priorities/DriveQuota.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/DriveQuota.hpp b/common/priorities/DriveQuota.hpp
similarity index 100%
rename from scheduler/DriveQuota.hpp
rename to common/priorities/DriveQuota.hpp
diff --git a/scheduler/MountCriteria.cpp b/common/priorities/MountCriteria.cpp
similarity index 97%
rename from scheduler/MountCriteria.cpp
rename to common/priorities/MountCriteria.cpp
index 31e212316e5fb1567b7d2a2551e6bce1a200bdeb..58196e92f87058f51b7b3cdf16a26a1b958eaf26 100644
--- a/scheduler/MountCriteria.cpp
+++ b/common/priorities/MountCriteria.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/MountCriteria.hpp"
+#include "common/priorities/MountCriteria.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/MountCriteria.hpp b/common/priorities/MountCriteria.hpp
similarity index 100%
rename from scheduler/MountCriteria.hpp
rename to common/priorities/MountCriteria.hpp
diff --git a/scheduler/UserGroup.cpp b/common/priorities/UserGroup.cpp
similarity index 98%
rename from scheduler/UserGroup.cpp
rename to common/priorities/UserGroup.cpp
index e8d78435a5e9fbdc89f24c7a6aeeb34091d96df9..76df73aed7ce9af5450d4836dc129a57941436c1 100644
--- a/scheduler/UserGroup.cpp
+++ b/common/priorities/UserGroup.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/UserGroup.hpp"
+#include "common/priorities/UserGroup.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/UserGroup.hpp b/common/priorities/UserGroup.hpp
similarity index 97%
rename from scheduler/UserGroup.hpp
rename to common/priorities/UserGroup.hpp
index 9d365dfd1af59737e3f3da18d10b6a911cee1c65..33715d13b35c9a5740c18c262c7bf51529a5282b 100644
--- a/scheduler/UserGroup.hpp
+++ b/common/priorities/UserGroup.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include "common/CreationLog.hpp"
-#include "scheduler/DriveQuota.hpp"
-#include "scheduler/MountCriteria.hpp"
+#include "common/priorities/DriveQuota.hpp"
+#include "common/priorities/MountCriteria.hpp"
 
 #include <stdint.h>
 #include <string>
diff --git a/nameserver/CastorNameServer.hpp b/nameserver/CastorNameServer.hpp
index 31e00d133bed7668e4003a553d05a2ebecfb25e3..c0e5ba26e556498a78483d6836fb53714a63608e 100644
--- a/nameserver/CastorNameServer.hpp
+++ b/nameserver/CastorNameServer.hpp
@@ -21,7 +21,7 @@
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/UserIdentity.hpp"
 #include "nameserver/NameServer.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <list>
 #include <string>
diff --git a/nameserver/NameServer.hpp b/nameserver/NameServer.hpp
index a35f4f9835a31de64a5345d0744e2bfb2b1b347c..4144b59f877a63457db5bfc2a6738319da127b4f 100644
--- a/nameserver/NameServer.hpp
+++ b/nameserver/NameServer.hpp
@@ -20,7 +20,7 @@
 
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/archiveNS/ArchiveFileStatus.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <memory>
 #include <string>
diff --git a/nameserver/mockNS/MockNameServer.hpp b/nameserver/mockNS/MockNameServer.hpp
index a6db975ad559aa7ff8f1142871ce717e786b910b..0f5a4908626df7d496f893994b028e2c6670ee1a 100644
--- a/nameserver/mockNS/MockNameServer.hpp
+++ b/nameserver/mockNS/MockNameServer.hpp
@@ -21,7 +21,7 @@
 #include "common/archiveNS/ArchiveDirIterator.hpp"
 #include "common/UserIdentity.hpp"
 #include "nameserver/NameServer.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 
 #include <list>
 #include <string>
diff --git a/scheduler/CMakeLists.txt b/scheduler/CMakeLists.txt
index aa1ecd6833797b83c0fd420d459f43dc7bdd3d85..18734bf79ee2f7c3b61a6dd36bf301a87febeebd 100644
--- a/scheduler/CMakeLists.txt
+++ b/scheduler/CMakeLists.txt
@@ -11,13 +11,10 @@ set (CTA_SCHEDULER_SRC_FILES
   ArchiveToDirRequest.cpp
   ArchiveToFileRequest.cpp
   ArchiveToTapeCopyRequest.cpp
-  DiskException.cpp
-  DriveQuota.cpp
   TapeJob.cpp
   LogicalLibrary.cpp
   mockDB/MockSchedulerDatabase.cpp
   mockDB/MockSchedulerDatabaseFactory.cpp
-  MountCriteria.cpp
   RetrieveJob.cpp
   RetrieveFromTapeCopyRequest.cpp
   RetrieveRequest.cpp
@@ -26,18 +23,10 @@ set (CTA_SCHEDULER_SRC_FILES
   Scheduler.cpp
   SchedulerDatabase.cpp
   SchedulerDatabaseFactory.cpp
-  SecurityIdentity.cpp
   mockDB/SqliteColumnNameToIndex.cpp
   mockDB/SQLiteStatementDeleter.cpp
-  StorageClass.cpp
-  Tape.cpp
-  TapeCopyLocation.cpp
-  TapeException.cpp
-  TapePool.cpp
   TapeSession.cpp
-  UserGroup.cpp
-  UserRequest.cpp
-  VO.cpp)
+  UserRequest.cpp)
 
 add_library (ctascheduler SHARED
   ${CTA_SCHEDULER_SRC_FILES})
@@ -49,8 +38,7 @@ add_library (ctaschedulertest SHARED
   mockDB/MockSchedulerDatabaseFactory.cpp
   SchedulerDatabaseFactory.cpp
   SchedulerDatabaseTest.cpp
-  SchedulerTest.cpp
-  UserIdentityTest.cpp)
+  SchedulerTest.cpp)
 
 target_link_libraries (ctaschedulertest ${SQLITE3_LIBRARY_RELEASE})
 
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 0b0bfa1b51125c1615b6d2a0e828c42d7ad626c9..e9929f17592a6efede67cf800183b3572fe61c5b 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "OStoreDB.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "objectstore/RootEntry.hpp"
 #include "objectstore/TapePool.hpp"
 #include "objectstore/Tape.hpp"
@@ -31,12 +31,12 @@
 #include "scheduler/ArchiveToFileRequest.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
+#include "common/archiveNS/Tape.hpp"
 #include "ArchiveToDirRequest.hpp"
 #include "RetrieveToFileRequest.hpp"
-#include "TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 #include "RetrieveToDirRequest.hpp"
 #include "ArchiveToTapeCopyRequest.hpp"
 #include <algorithm>
diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp
index 0db1e2f896028976d4c0d8a9130bbca1fbadd1fb..4eb369ee0a5bfa1aba5810e0fa7cf3817b808fb4 100644
--- a/scheduler/OStoreDB/OStoreDBFactory.hpp
+++ b/scheduler/OStoreDB/OStoreDBFactory.hpp
@@ -20,9 +20,9 @@
 
 #include "scheduler/SchedulerDatabaseFactory.hpp"
 #include "scheduler/OStoreDB/OStoreDB.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/Tape.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
+#include "common/archiveNS/Tape.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/ArchiveToTapeCopyRequest.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
diff --git a/scheduler/RetrieveFromTapeCopyRequest.cpp b/scheduler/RetrieveFromTapeCopyRequest.cpp
index 152410f122490f43a859fbaa400dfd4febdffe0f..9168bb001fef353e076442ee57484dcc202337d0 100644
--- a/scheduler/RetrieveFromTapeCopyRequest.cpp
+++ b/scheduler/RetrieveFromTapeCopyRequest.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/RetrieveFromTapeCopyRequest.hpp b/scheduler/RetrieveFromTapeCopyRequest.hpp
index 24dda40309fb9dea9ea0a13d280e9cea342a4a64..440c48b606d33db2ab90913c3a9aa868944ca7c3 100644
--- a/scheduler/RetrieveFromTapeCopyRequest.hpp
+++ b/scheduler/RetrieveFromTapeCopyRequest.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/RetrieveRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 #include <list>
 #include <string>
diff --git a/scheduler/RetrieveJob.hpp b/scheduler/RetrieveJob.hpp
index eb6dcee2e7d0f42ffe96052a97860bca040717ca..d665f005b875c6cf4b6af9db7176e2637d605a20 100644
--- a/scheduler/RetrieveJob.hpp
+++ b/scheduler/RetrieveJob.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/TapeJob.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 #include <string>
 
diff --git a/scheduler/RetrieveToFileRequest.cpp b/scheduler/RetrieveToFileRequest.cpp
index eaf196e6d75d62f281512363193afb8a049e6c19..a588be745a8a5d45a45eb3cc69133fffe598fde4 100644
--- a/scheduler/RetrieveToFileRequest.cpp
+++ b/scheduler/RetrieveToFileRequest.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/TapeCopyLocation.hpp"
+#include "common/archiveNS/TapeCopyLocation.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 6e6a1e2746047f8486c1fd69053a1ffd72a7b0a4..5470755713c1119642d1c242c9244e64d71195cf 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -35,10 +35,10 @@
 #include "scheduler/RetrieveToFileRequest.hpp"
 #include "scheduler/Scheduler.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 #include "scheduler/TapeMount.hpp"
 
 #include <iostream>
diff --git a/scheduler/SchedulerDatabaseTest.cpp b/scheduler/SchedulerDatabaseTest.cpp
index 494e9aeeb66dcc46cc612a9269f39f9b0c0222e2..839d70d3706c8795cb022d697d7764a3db62cc35 100644
--- a/scheduler/SchedulerDatabaseTest.cpp
+++ b/scheduler/SchedulerDatabaseTest.cpp
@@ -24,7 +24,7 @@
 #include "scheduler/mockDB/MockSchedulerDatabaseFactory.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
 #include "scheduler/SchedulerDatabaseFactory.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "OStoreDB/OStoreDBFactory.hpp"
 
 #include <exception>
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index a83bff323c340cad227b143bbf99ad1f4c60aa43..b2333083f63321337f21bb0a15caf4b9b11badbf 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -29,10 +29,10 @@
 #include "scheduler/MountRequest.hpp"
 #include "scheduler/Scheduler.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 #include "OStoreDB/OStoreDBFactory.hpp"
 
 #include <exception>
diff --git a/scheduler/mockDB/MockSchedulerDatabase.cpp b/scheduler/mockDB/MockSchedulerDatabase.cpp
index 8b6a881915f8e6dd4c51c101dc0cff859de370cb..c677cbd8b365932019fc116cc15e3413a08b6095 100644
--- a/scheduler/mockDB/MockSchedulerDatabase.cpp
+++ b/scheduler/mockDB/MockSchedulerDatabase.cpp
@@ -30,12 +30,12 @@
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "scheduler/mockDB/SqliteColumnNameToIndex.hpp"
 #include "scheduler/mockDB/SQLiteStatementDeleter.hpp"
-#include "scheduler/StorageClass.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/scheduler/mockDB/MockSchedulerDatabase.hpp b/scheduler/mockDB/MockSchedulerDatabase.hpp
index 3030b99e6de5a9ba09b1fc2a203d199ec4bda18d..dca88585de2f3e0b95684195d8b4709036cedc68 100644
--- a/scheduler/mockDB/MockSchedulerDatabase.hpp
+++ b/scheduler/mockDB/MockSchedulerDatabase.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "common/exception/Exception.hpp"
 
 #include <sqlite3.h>
diff --git a/xroot_plugins/XrdProFile.cpp b/xroot_plugins/XrdProFile.cpp
index 7fb1b51935c3a128e193e846cd5c9cb6ea02c4e0..7acb60cc097713cebc0f9b1b1288ef47774bae20 100644
--- a/xroot_plugins/XrdProFile.cpp
+++ b/xroot_plugins/XrdProFile.cpp
@@ -27,11 +27,11 @@
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
-#include "scheduler/SecurityIdentity.hpp"
+#include "common/archiveNS/Tape.hpp"
+#include "common/TapePool.hpp"
+#include "common/SecurityIdentity.hpp"
 #include "xroot_plugins/XrdProFile.hpp"
 
 #include "XrdSec/XrdSecEntity.hh"
diff --git a/xroot_plugins/XrdProFilesystem.cpp b/xroot_plugins/XrdProFilesystem.cpp
index bc9c7c21c778026ddd967e31beeb4a6ce126cccb..ca896d7ba4efa0dfacbcd9b1cd32daa9b773ea3e 100644
--- a/xroot_plugins/XrdProFilesystem.cpp
+++ b/xroot_plugins/XrdProFilesystem.cpp
@@ -29,10 +29,10 @@
 #include "scheduler/OStoreDB/OStoreDB.hpp"
 #include "scheduler/mockDB/MockSchedulerDatabase.hpp"
 #include "scheduler/RetrieveFromTapeCopyRequest.hpp"
-#include "scheduler/StorageClass.hpp"
+#include "common/archiveNS/StorageClass.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
-#include "scheduler/Tape.hpp"
-#include "scheduler/TapePool.hpp"
+#include "common/archiveNS/StorageClass.hpp"
+#include "common/TapePool.hpp"
 #include "XrdProFilesystem.hpp"
 #include "XrdProFile.hpp"
 #include "XrdOuc/XrdOucString.hh"