From 53957bb63227922b45410792062ea5a1d1a96da5 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 8 Apr 2015 10:10:30 +0200
Subject: [PATCH] Removed the redundant libs directory by bringing the
 middletier sub-directory up

---
 CMakeLists.txt                                |  4 +-
 libs/CMakeLists.txt                           |  3 --
 libs/middletier/CMakeLists.txt                | 51 -------------------
 middletier/CMakeLists.txt                     | 51 +++++++++++++++++++
 .../cta}/AdminHost.cpp                        |  2 +-
 .../cta}/AdminHost.hpp                        |  2 +-
 .../cta}/AdminUser.cpp                        |  2 +-
 .../cta}/AdminUser.hpp                        |  2 +-
 .../cta}/ArchivalJob.cpp                      |  2 +-
 .../cta}/ArchivalJob.hpp                      |  4 +-
 .../cta}/ArchivalJobState.cpp                 |  2 +-
 .../cta}/ArchivalJobState.hpp                 |  0
 .../cta}/ArchiveRoute.cpp                     |  2 +-
 .../cta}/ArchiveRoute.hpp                     |  2 +-
 .../cta}/ArchiveRouteId.cpp                   |  2 +-
 .../cta}/ArchiveRouteId.hpp                   |  0
 .../cta}/DirectoryEntry.cpp                   |  2 +-
 .../cta}/DirectoryEntry.hpp                   |  0
 .../cta}/DirectoryIterator.cpp                |  4 +-
 .../cta}/DirectoryIterator.hpp                |  2 +-
 .../cta}/Exception.cpp                        |  2 +-
 .../cta}/Exception.hpp                        |  0
 .../cta}/FileAttribute.cpp                    |  2 +-
 .../cta}/FileAttribute.hpp                    |  0
 .../cta}/FileSystemDirectoryEntry.cpp         |  2 +-
 .../cta}/FileSystemDirectoryEntry.hpp         |  4 +-
 .../cta}/FileSystemNode.cpp                   |  4 +-
 .../cta}/FileSystemNode.hpp                   |  4 +-
 .../cta}/FileSystemStorageClass.cpp           |  2 +-
 .../cta}/FileSystemStorageClass.hpp           |  6 +--
 .../cta}/FileSystemStorageClasses.cpp         |  4 +-
 .../cta}/FileSystemStorageClasses.hpp         |  4 +-
 .../cta}/LogicalLibrary.cpp                   |  2 +-
 .../cta}/LogicalLibrary.hpp                   |  2 +-
 .../cta}/MiddleTierAdmin.cpp                  |  2 +-
 .../cta}/MiddleTierAdmin.hpp                  | 22 ++++----
 .../cta}/MiddleTierUser.cpp                   |  2 +-
 .../cta}/MiddleTierUser.hpp                   | 20 ++++----
 .../cta}/RetrievalJob.cpp                     |  2 +-
 .../cta}/RetrievalJob.hpp                     |  4 +-
 .../cta}/RetrievalJobState.cpp                |  2 +-
 .../cta}/RetrievalJobState.hpp                |  0
 .../cta}/SecurityIdentity.cpp                 |  2 +-
 .../cta}/SecurityIdentity.hpp                 |  2 +-
 .../cta}/SqliteDatabase.cpp                   |  6 +--
 .../cta}/SqliteDatabase.hpp                   | 20 ++++----
 .../cta}/SqliteMiddleTierAdmin.cpp            |  4 +-
 .../cta}/SqliteMiddleTierAdmin.hpp            |  6 +--
 .../cta}/SqliteMiddleTierAdminTest.cpp        |  4 +-
 .../cta}/SqliteMiddleTierUser.cpp             |  6 +--
 .../cta}/SqliteMiddleTierUser.hpp             | 12 ++---
 .../cta}/SqliteMiddleTierUserTest.cpp         |  4 +-
 .../cta}/StorageClass.cpp                     |  2 +-
 .../cta}/StorageClass.hpp                     |  2 +-
 {libs/middletier => middletier/cta}/Tape.cpp  |  2 +-
 {libs/middletier => middletier/cta}/Tape.hpp  |  2 +-
 .../cta}/TapePool.cpp                         |  2 +-
 .../cta}/TapePool.hpp                         |  2 +-
 .../cta}/UserIdentity.cpp                     |  2 +-
 .../cta}/UserIdentity.hpp                     |  0
 {libs/middletier => middletier/cta}/Utils.cpp |  4 +-
 {libs/middletier => middletier/cta}/Utils.hpp |  0
 .../cta}/UtilsTest.cpp                        |  2 +-
 {libs/middletier => middletier/cta}/Vfs.cpp   |  6 +--
 {libs/middletier => middletier/cta}/Vfs.hpp   |  4 +-
 .../middletier => middletier/cta}/VfsTest.cpp |  2 +-
 objectstore/AdminUsersList.hpp                |  4 +-
 objectstore/CMakeLists.txt                    |  5 +-
 objectstore/exception/Errnum.cpp              |  4 +-
 objectstore/exception/Exception.cpp           |  2 +-
 objectstore/threading/ChildProcess.hpp        |  4 +-
 objectstore/threading/Mutex.cpp               |  6 +--
 objectstore/threading/Threading.hpp           |  7 +--
 objectstore_middletier/CMakeLists.txt         |  5 +-
 .../ObjectStoreMiddleTier.cpp                 |  2 +-
 .../ObjectStoreMiddleTier.hpp                 |  2 +-
 xroot_plugins/CMakeLists.txt                  |  4 +-
 xroot_plugins/XrdProDir.hpp                   |  5 +-
 xroot_plugins/XrdProFilesystem.cpp            |  3 +-
 xroot_plugins/XrdProFilesystem.hpp            |  4 +-
 80 files changed, 193 insertions(+), 193 deletions(-)
 delete mode 100644 libs/CMakeLists.txt
 delete mode 100644 libs/middletier/CMakeLists.txt
 create mode 100644 middletier/CMakeLists.txt
 rename {libs/middletier => middletier/cta}/AdminHost.cpp (98%)
 rename {libs/middletier => middletier/cta}/AdminHost.hpp (98%)
 rename {libs/middletier => middletier/cta}/AdminUser.cpp (98%)
 rename {libs/middletier => middletier/cta}/AdminUser.hpp (98%)
 rename {libs/middletier => middletier/cta}/ArchivalJob.cpp (98%)
 rename {libs/middletier => middletier/cta}/ArchivalJob.hpp (97%)
 rename {libs/middletier => middletier/cta}/ArchivalJobState.cpp (93%)
 rename {libs/middletier => middletier/cta}/ArchivalJobState.hpp (100%)
 rename {libs/middletier => middletier/cta}/ArchiveRoute.cpp (98%)
 rename {libs/middletier => middletier/cta}/ArchiveRoute.hpp (98%)
 rename {libs/middletier => middletier/cta}/ArchiveRouteId.cpp (97%)
 rename {libs/middletier => middletier/cta}/ArchiveRouteId.hpp (100%)
 rename {libs/middletier => middletier/cta}/DirectoryEntry.cpp (98%)
 rename {libs/middletier => middletier/cta}/DirectoryEntry.hpp (100%)
 rename {libs/middletier => middletier/cta}/DirectoryIterator.cpp (95%)
 rename {libs/middletier => middletier/cta}/DirectoryIterator.hpp (97%)
 rename {libs/middletier => middletier/cta}/Exception.cpp (96%)
 rename {libs/middletier => middletier/cta}/Exception.hpp (100%)
 rename {libs/middletier => middletier/cta}/FileAttribute.cpp (93%)
 rename {libs/middletier => middletier/cta}/FileAttribute.hpp (100%)
 rename {libs/middletier => middletier/cta}/FileSystemDirectoryEntry.cpp (97%)
 rename {libs/middletier => middletier/cta}/FileSystemDirectoryEntry.hpp (93%)
 rename {libs/middletier => middletier/cta}/FileSystemNode.cpp (98%)
 rename {libs/middletier => middletier/cta}/FileSystemNode.hpp (97%)
 rename {libs/middletier => middletier/cta}/FileSystemStorageClass.cpp (98%)
 rename {libs/middletier => middletier/cta}/FileSystemStorageClass.hpp (92%)
 rename {libs/middletier => middletier/cta}/FileSystemStorageClasses.cpp (98%)
 rename {libs/middletier => middletier/cta}/FileSystemStorageClasses.hpp (97%)
 rename {libs/middletier => middletier/cta}/LogicalLibrary.cpp (98%)
 rename {libs/middletier => middletier/cta}/LogicalLibrary.hpp (98%)
 rename {libs/middletier => middletier/cta}/MiddleTierAdmin.cpp (86%)
 rename {libs/middletier => middletier/cta}/MiddleTierAdmin.hpp (96%)
 rename {libs/middletier => middletier/cta}/MiddleTierUser.cpp (87%)
 rename {libs/middletier => middletier/cta}/MiddleTierUser.hpp (95%)
 rename {libs/middletier => middletier/cta}/RetrievalJob.cpp (98%)
 rename {libs/middletier => middletier/cta}/RetrievalJob.hpp (97%)
 rename {libs/middletier => middletier/cta}/RetrievalJobState.cpp (93%)
 rename {libs/middletier => middletier/cta}/RetrievalJobState.hpp (100%)
 rename {libs/middletier => middletier/cta}/SecurityIdentity.cpp (93%)
 rename {libs/middletier => middletier/cta}/SecurityIdentity.hpp (94%)
 rename {libs/middletier => middletier/cta}/SqliteDatabase.cpp (99%)
 rename {libs/middletier => middletier/cta}/SqliteDatabase.hpp (93%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierAdmin.cpp (99%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierAdmin.hpp (98%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierAdminTest.cpp (99%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierUser.cpp (99%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierUser.hpp (97%)
 rename {libs/middletier => middletier/cta}/SqliteMiddleTierUserTest.cpp (99%)
 rename {libs/middletier => middletier/cta}/StorageClass.cpp (98%)
 rename {libs/middletier => middletier/cta}/StorageClass.hpp (98%)
 rename {libs/middletier => middletier/cta}/Tape.cpp (99%)
 rename {libs/middletier => middletier/cta}/Tape.hpp (98%)
 rename {libs/middletier => middletier/cta}/TapePool.cpp (98%)
 rename {libs/middletier => middletier/cta}/TapePool.hpp (98%)
 rename {libs/middletier => middletier/cta}/UserIdentity.cpp (97%)
 rename {libs/middletier => middletier/cta}/UserIdentity.hpp (100%)
 rename {libs/middletier => middletier/cta}/Utils.cpp (99%)
 rename {libs/middletier => middletier/cta}/Utils.hpp (100%)
 rename {libs/middletier => middletier/cta}/UtilsTest.cpp (99%)
 rename {libs/middletier => middletier/cta}/Vfs.cpp (99%)
 rename {libs/middletier => middletier/cta}/Vfs.hpp (96%)
 rename {libs/middletier => middletier/cta}/VfsTest.cpp (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5ac62eb0b..aba514ef4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-include_directories(${CMAKE_SOURCE_DIR})
-
-add_subdirectory(libs)
+add_subdirectory(middletier)
 add_subdirectory(objectstore)
 add_subdirectory(objectstore_middletier)
 add_subdirectory(tests)
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
deleted file mode 100644
index df8559d2c9..0000000000
--- a/libs/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-
-add_subdirectory(middletier)
diff --git a/libs/middletier/CMakeLists.txt b/libs/middletier/CMakeLists.txt
deleted file mode 100644
index 8bafe4336b..0000000000
--- a/libs/middletier/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-
-find_package (sqlite REQUIRED)
-include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
-
-set (MIDDLE_TIER_LIB_SRC_FILES
-  AdminHost.cpp
-  AdminUser.cpp
-  ArchivalJob.cpp
-  ArchivalJobState.cpp
-  ArchiveRoute.cpp
-  ArchiveRouteId.cpp
-  DirectoryEntry.cpp
-  DirectoryIterator.cpp
-  Exception.cpp
-  FileAttribute.cpp
-  FileSystemDirectoryEntry.cpp
-  FileSystemNode.cpp
-  FileSystemStorageClass.cpp
-  FileSystemStorageClasses.cpp
-  LogicalLibrary.cpp
-  MiddleTierAdmin.cpp
-  MiddleTierUser.cpp
-  RetrievalJob.cpp
-  RetrievalJobState.cpp
-  SecurityIdentity.cpp
-  SqliteDatabase.cpp
-  SqliteMiddleTierAdmin.cpp
-  SqliteMiddleTierUser.cpp
-  StorageClass.cpp
-  Tape.cpp
-  TapePool.cpp
-  UserIdentity.cpp
-  Utils.cpp
-  Vfs.cpp)
-
-add_library (ctamiddletier SHARED
-  ${MIDDLE_TIER_LIB_SRC_FILES})
-
-target_link_libraries (ctamiddletier ${SQLITE3_LIBRARY_RELEASE})
-
-set (MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES
-  SqliteMiddleTierAdminTest.cpp
-  SqliteMiddleTierUserTest.cpp
-  UtilsTest.cpp
-  VfsTest.cpp)
-
-add_library (ctamiddletierunittests SHARED
-  ${MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES})
-
-target_link_libraries (ctamiddletierunittests ${SQLITE3_LIBRARY_RELEASE})
diff --git a/middletier/CMakeLists.txt b/middletier/CMakeLists.txt
new file mode 100644
index 0000000000..cc8dc2a342
--- /dev/null
+++ b/middletier/CMakeLists.txt
@@ -0,0 +1,51 @@
+cmake_minimum_required (VERSION 2.6)
+
+find_package (sqlite REQUIRED)
+include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+
+set (MIDDLE_TIER_LIB_SRC_FILES
+  cta/AdminHost.cpp
+  cta/AdminUser.cpp
+  cta/ArchivalJob.cpp
+  cta/ArchivalJobState.cpp
+  cta/ArchiveRoute.cpp
+  cta/ArchiveRouteId.cpp
+  cta/DirectoryEntry.cpp
+  cta/DirectoryIterator.cpp
+  cta/Exception.cpp
+  cta/FileAttribute.cpp
+  cta/FileSystemDirectoryEntry.cpp
+  cta/FileSystemNode.cpp
+  cta/FileSystemStorageClass.cpp
+  cta/FileSystemStorageClasses.cpp
+  cta/LogicalLibrary.cpp
+  cta/MiddleTierAdmin.cpp
+  cta/MiddleTierUser.cpp
+  cta/RetrievalJob.cpp
+  cta/RetrievalJobState.cpp
+  cta/SecurityIdentity.cpp
+  cta/SqliteDatabase.cpp
+  cta/SqliteMiddleTierAdmin.cpp
+  cta/SqliteMiddleTierUser.cpp
+  cta/StorageClass.cpp
+  cta/Tape.cpp
+  cta/TapePool.cpp
+  cta/UserIdentity.cpp
+  cta/Utils.cpp
+  cta/Vfs.cpp)
+
+add_library (ctamiddletier SHARED
+  ${MIDDLE_TIER_LIB_SRC_FILES})
+
+target_link_libraries (ctamiddletier ${SQLITE3_LIBRARY_RELEASE})
+
+set (MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES
+  cta/SqliteMiddleTierAdminTest.cpp
+  cta/SqliteMiddleTierUserTest.cpp
+  cta/UtilsTest.cpp
+  cta/VfsTest.cpp)
+
+add_library (ctamiddletierunittests SHARED
+  ${MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES})
+
+target_link_libraries (ctamiddletierunittests ${SQLITE3_LIBRARY_RELEASE})
diff --git a/libs/middletier/AdminHost.cpp b/middletier/cta/AdminHost.cpp
similarity index 98%
rename from libs/middletier/AdminHost.cpp
rename to middletier/cta/AdminHost.cpp
index 3041a39076..39735f75df 100644
--- a/libs/middletier/AdminHost.cpp
+++ b/middletier/cta/AdminHost.cpp
@@ -1,4 +1,4 @@
-#include "AdminHost.hpp"
+#include "cta/AdminHost.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/AdminHost.hpp b/middletier/cta/AdminHost.hpp
similarity index 98%
rename from libs/middletier/AdminHost.hpp
rename to middletier/cta/AdminHost.hpp
index 33176bf9b2..a7ffdc6c94 100644
--- a/libs/middletier/AdminHost.hpp
+++ b/middletier/cta/AdminHost.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/AdminUser.cpp b/middletier/cta/AdminUser.cpp
similarity index 98%
rename from libs/middletier/AdminUser.cpp
rename to middletier/cta/AdminUser.cpp
index 881de88dde..2a2240a63a 100644
--- a/libs/middletier/AdminUser.cpp
+++ b/middletier/cta/AdminUser.cpp
@@ -1,4 +1,4 @@
-#include "AdminUser.hpp"
+#include "cta/AdminUser.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/AdminUser.hpp b/middletier/cta/AdminUser.hpp
similarity index 98%
rename from libs/middletier/AdminUser.hpp
rename to middletier/cta/AdminUser.hpp
index 7a3827a589..2a7dc0526c 100644
--- a/libs/middletier/AdminUser.hpp
+++ b/middletier/cta/AdminUser.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/ArchivalJob.cpp b/middletier/cta/ArchivalJob.cpp
similarity index 98%
rename from libs/middletier/ArchivalJob.cpp
rename to middletier/cta/ArchivalJob.cpp
index e7aa755b0d..e8964aed07 100644
--- a/libs/middletier/ArchivalJob.cpp
+++ b/middletier/cta/ArchivalJob.cpp
@@ -1,4 +1,4 @@
-#include "ArchivalJob.hpp"
+#include "cta/ArchivalJob.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/ArchivalJob.hpp b/middletier/cta/ArchivalJob.hpp
similarity index 97%
rename from libs/middletier/ArchivalJob.hpp
rename to middletier/cta/ArchivalJob.hpp
index 95726bf92a..f0b278ea63 100644
--- a/libs/middletier/ArchivalJob.hpp
+++ b/middletier/cta/ArchivalJob.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ArchivalJobState.hpp"
-#include "UserIdentity.hpp"
+#include "cta/ArchivalJobState.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 #include <time.h>
diff --git a/libs/middletier/ArchivalJobState.cpp b/middletier/cta/ArchivalJobState.cpp
similarity index 93%
rename from libs/middletier/ArchivalJobState.cpp
rename to middletier/cta/ArchivalJobState.cpp
index 77738f3ab9..f6b231d639 100644
--- a/libs/middletier/ArchivalJobState.cpp
+++ b/middletier/cta/ArchivalJobState.cpp
@@ -1,4 +1,4 @@
-#include "ArchivalJob.hpp"
+#include "cta/ArchivalJob.hpp"
 
 //------------------------------------------------------------------------------
 // toStr
diff --git a/libs/middletier/ArchivalJobState.hpp b/middletier/cta/ArchivalJobState.hpp
similarity index 100%
rename from libs/middletier/ArchivalJobState.hpp
rename to middletier/cta/ArchivalJobState.hpp
diff --git a/libs/middletier/ArchiveRoute.cpp b/middletier/cta/ArchiveRoute.cpp
similarity index 98%
rename from libs/middletier/ArchiveRoute.cpp
rename to middletier/cta/ArchiveRoute.cpp
index 108811f447..8f383d664d 100644
--- a/libs/middletier/ArchiveRoute.cpp
+++ b/middletier/cta/ArchiveRoute.cpp
@@ -1,4 +1,4 @@
-#include "ArchiveRoute.hpp"
+#include "cta/ArchiveRoute.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/ArchiveRoute.hpp b/middletier/cta/ArchiveRoute.hpp
similarity index 98%
rename from libs/middletier/ArchiveRoute.hpp
rename to middletier/cta/ArchiveRoute.hpp
index 09258f9023..82409845a3 100644
--- a/libs/middletier/ArchiveRoute.hpp
+++ b/middletier/cta/ArchiveRoute.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <stdint.h>
 #include <string>
diff --git a/libs/middletier/ArchiveRouteId.cpp b/middletier/cta/ArchiveRouteId.cpp
similarity index 97%
rename from libs/middletier/ArchiveRouteId.cpp
rename to middletier/cta/ArchiveRouteId.cpp
index 0741b9427f..92494fa550 100644
--- a/libs/middletier/ArchiveRouteId.cpp
+++ b/middletier/cta/ArchiveRouteId.cpp
@@ -1,4 +1,4 @@
-#include "ArchiveRouteId.hpp"
+#include "cta/ArchiveRouteId.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/ArchiveRouteId.hpp b/middletier/cta/ArchiveRouteId.hpp
similarity index 100%
rename from libs/middletier/ArchiveRouteId.hpp
rename to middletier/cta/ArchiveRouteId.hpp
diff --git a/libs/middletier/DirectoryEntry.cpp b/middletier/cta/DirectoryEntry.cpp
similarity index 98%
rename from libs/middletier/DirectoryEntry.cpp
rename to middletier/cta/DirectoryEntry.cpp
index bc9ac0d612..ee04a87ce1 100644
--- a/libs/middletier/DirectoryEntry.cpp
+++ b/middletier/cta/DirectoryEntry.cpp
@@ -1,4 +1,4 @@
-#include "DirectoryEntry.hpp"
+#include "cta/DirectoryEntry.hpp"
 
 //------------------------------------------------------------------------------
 // entryTypeToStr
diff --git a/libs/middletier/DirectoryEntry.hpp b/middletier/cta/DirectoryEntry.hpp
similarity index 100%
rename from libs/middletier/DirectoryEntry.hpp
rename to middletier/cta/DirectoryEntry.hpp
diff --git a/libs/middletier/DirectoryIterator.cpp b/middletier/cta/DirectoryIterator.cpp
similarity index 95%
rename from libs/middletier/DirectoryIterator.cpp
rename to middletier/cta/DirectoryIterator.cpp
index dbff1d5e31..68a95381c2 100644
--- a/libs/middletier/DirectoryIterator.cpp
+++ b/middletier/cta/DirectoryIterator.cpp
@@ -1,5 +1,5 @@
-#include "DirectoryIterator.hpp"
-#include "Exception.hpp"
+#include "cta/DirectoryIterator.hpp"
+#include "cta/Exception.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/DirectoryIterator.hpp b/middletier/cta/DirectoryIterator.hpp
similarity index 97%
rename from libs/middletier/DirectoryIterator.hpp
rename to middletier/cta/DirectoryIterator.hpp
index 232efa492a..a4289324d8 100644
--- a/libs/middletier/DirectoryIterator.hpp
+++ b/middletier/cta/DirectoryIterator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DirectoryEntry.hpp"
+#include "cta/DirectoryEntry.hpp"
 
 #include <list>
 
diff --git a/libs/middletier/Exception.cpp b/middletier/cta/Exception.cpp
similarity index 96%
rename from libs/middletier/Exception.cpp
rename to middletier/cta/Exception.cpp
index 6754898b37..6cc84f390f 100644
--- a/libs/middletier/Exception.cpp
+++ b/middletier/cta/Exception.cpp
@@ -1,4 +1,4 @@
-#include "Exception.hpp"
+#include "cta/Exception.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/Exception.hpp b/middletier/cta/Exception.hpp
similarity index 100%
rename from libs/middletier/Exception.hpp
rename to middletier/cta/Exception.hpp
diff --git a/libs/middletier/FileAttribute.cpp b/middletier/cta/FileAttribute.cpp
similarity index 93%
rename from libs/middletier/FileAttribute.cpp
rename to middletier/cta/FileAttribute.cpp
index 84432ac75c..2da24957ae 100644
--- a/libs/middletier/FileAttribute.cpp
+++ b/middletier/cta/FileAttribute.cpp
@@ -1,4 +1,4 @@
-#include "FileAttribute.hpp"
+#include "cta/FileAttribute.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/FileAttribute.hpp b/middletier/cta/FileAttribute.hpp
similarity index 100%
rename from libs/middletier/FileAttribute.hpp
rename to middletier/cta/FileAttribute.hpp
diff --git a/libs/middletier/FileSystemDirectoryEntry.cpp b/middletier/cta/FileSystemDirectoryEntry.cpp
similarity index 97%
rename from libs/middletier/FileSystemDirectoryEntry.cpp
rename to middletier/cta/FileSystemDirectoryEntry.cpp
index ecb7b95c53..7d37f6bc23 100644
--- a/libs/middletier/FileSystemDirectoryEntry.cpp
+++ b/middletier/cta/FileSystemDirectoryEntry.cpp
@@ -1,4 +1,4 @@
-#include "FileSystemDirectoryEntry.hpp"
+#include "cta/FileSystemDirectoryEntry.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/FileSystemDirectoryEntry.hpp b/middletier/cta/FileSystemDirectoryEntry.hpp
similarity index 93%
rename from libs/middletier/FileSystemDirectoryEntry.hpp
rename to middletier/cta/FileSystemDirectoryEntry.hpp
index 01b204a0d2..250fab3d0d 100644
--- a/libs/middletier/FileSystemDirectoryEntry.hpp
+++ b/middletier/cta/FileSystemDirectoryEntry.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DirectoryEntry.hpp"
-#include "FileSystemStorageClasses.hpp"
+#include "cta/DirectoryEntry.hpp"
+#include "cta/FileSystemStorageClasses.hpp"
 
 namespace cta {
 
diff --git a/libs/middletier/FileSystemNode.cpp b/middletier/cta/FileSystemNode.cpp
similarity index 98%
rename from libs/middletier/FileSystemNode.cpp
rename to middletier/cta/FileSystemNode.cpp
index e062fd82ff..e2588ae78b 100644
--- a/libs/middletier/FileSystemNode.cpp
+++ b/middletier/cta/FileSystemNode.cpp
@@ -1,5 +1,5 @@
-#include "Exception.hpp"
-#include "FileSystemNode.hpp"
+#include "cta/Exception.hpp"
+#include "cta/FileSystemNode.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/FileSystemNode.hpp b/middletier/cta/FileSystemNode.hpp
similarity index 97%
rename from libs/middletier/FileSystemNode.hpp
rename to middletier/cta/FileSystemNode.hpp
index bd88c0ab86..3a9517ae37 100644
--- a/libs/middletier/FileSystemNode.hpp
+++ b/middletier/cta/FileSystemNode.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FileSystemDirectoryEntry.hpp"
-#include "FileSystemStorageClasses.hpp"
+#include "cta/FileSystemDirectoryEntry.hpp"
+#include "cta/FileSystemStorageClasses.hpp"
 
 #include <map>
 
diff --git a/libs/middletier/FileSystemStorageClass.cpp b/middletier/cta/FileSystemStorageClass.cpp
similarity index 98%
rename from libs/middletier/FileSystemStorageClass.cpp
rename to middletier/cta/FileSystemStorageClass.cpp
index 3269d6d7e6..7450a795c2 100644
--- a/libs/middletier/FileSystemStorageClass.cpp
+++ b/middletier/cta/FileSystemStorageClass.cpp
@@ -1,6 +1,6 @@
 #define __STDC_LIMIT_MACROS
 
-#include "FileSystemStorageClass.hpp"
+#include "cta/FileSystemStorageClass.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/FileSystemStorageClass.hpp b/middletier/cta/FileSystemStorageClass.hpp
similarity index 92%
rename from libs/middletier/FileSystemStorageClass.hpp
rename to middletier/cta/FileSystemStorageClass.hpp
index 70ac161d05..0becc5ee18 100644
--- a/libs/middletier/FileSystemStorageClass.hpp
+++ b/middletier/cta/FileSystemStorageClass.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Exception.hpp"
-#include "StorageClass.hpp"
-#include "UserIdentity.hpp"
+#include "cta/Exception.hpp"
+#include "cta/StorageClass.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <sstream>
 #include <string>
diff --git a/libs/middletier/FileSystemStorageClasses.cpp b/middletier/cta/FileSystemStorageClasses.cpp
similarity index 98%
rename from libs/middletier/FileSystemStorageClasses.cpp
rename to middletier/cta/FileSystemStorageClasses.cpp
index 52641487e7..1d45a8933c 100644
--- a/libs/middletier/FileSystemStorageClasses.cpp
+++ b/middletier/cta/FileSystemStorageClasses.cpp
@@ -1,5 +1,5 @@
-#include "Exception.hpp"
-#include "FileSystemStorageClasses.hpp"
+#include "cta/Exception.hpp"
+#include "cta/FileSystemStorageClasses.hpp"
 
 #include <sstream>
 
diff --git a/libs/middletier/FileSystemStorageClasses.hpp b/middletier/cta/FileSystemStorageClasses.hpp
similarity index 97%
rename from libs/middletier/FileSystemStorageClasses.hpp
rename to middletier/cta/FileSystemStorageClasses.hpp
index c13a1eccb5..00c4037798 100644
--- a/libs/middletier/FileSystemStorageClasses.hpp
+++ b/middletier/cta/FileSystemStorageClasses.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "FileSystemStorageClass.hpp"
-#include "UserIdentity.hpp"
+#include "cta/FileSystemStorageClass.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <list>
 #include <map>
diff --git a/libs/middletier/LogicalLibrary.cpp b/middletier/cta/LogicalLibrary.cpp
similarity index 98%
rename from libs/middletier/LogicalLibrary.cpp
rename to middletier/cta/LogicalLibrary.cpp
index 003c8f4a98..e08d844f0b 100644
--- a/libs/middletier/LogicalLibrary.cpp
+++ b/middletier/cta/LogicalLibrary.cpp
@@ -1,4 +1,4 @@
-#include "LogicalLibrary.hpp"
+#include "cta/LogicalLibrary.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/LogicalLibrary.hpp b/middletier/cta/LogicalLibrary.hpp
similarity index 98%
rename from libs/middletier/LogicalLibrary.hpp
rename to middletier/cta/LogicalLibrary.hpp
index 7590a7a756..4783286f71 100644
--- a/libs/middletier/LogicalLibrary.hpp
+++ b/middletier/cta/LogicalLibrary.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/MiddleTierAdmin.cpp b/middletier/cta/MiddleTierAdmin.cpp
similarity index 86%
rename from libs/middletier/MiddleTierAdmin.cpp
rename to middletier/cta/MiddleTierAdmin.cpp
index 2d62bf66bf..f8166b352f 100644
--- a/libs/middletier/MiddleTierAdmin.cpp
+++ b/middletier/cta/MiddleTierAdmin.cpp
@@ -1,4 +1,4 @@
-#include "MiddleTierAdmin.hpp"
+#include "cta/MiddleTierAdmin.hpp"
 
 //------------------------------------------------------------------------------
 // destructor
diff --git a/libs/middletier/MiddleTierAdmin.hpp b/middletier/cta/MiddleTierAdmin.hpp
similarity index 96%
rename from libs/middletier/MiddleTierAdmin.hpp
rename to middletier/cta/MiddleTierAdmin.hpp
index 7dd7184e1f..e52571a78d 100644
--- a/libs/middletier/MiddleTierAdmin.hpp
+++ b/middletier/cta/MiddleTierAdmin.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "AdminHost.hpp"
-#include "AdminUser.hpp"
-#include "ArchivalJob.hpp"
-#include "ArchiveRoute.hpp"
-#include "DirectoryIterator.hpp"
-#include "LogicalLibrary.hpp"
-#include "SecurityIdentity.hpp"
-#include "StorageClass.hpp"
-#include "Tape.hpp"
-#include "TapePool.hpp"
-#include "UserIdentity.hpp"
+#include "cta/AdminHost.hpp"
+#include "cta/AdminUser.hpp"
+#include "cta/ArchivalJob.hpp"
+#include "cta/ArchiveRoute.hpp"
+#include "cta/DirectoryIterator.hpp"
+#include "cta/LogicalLibrary.hpp"
+#include "cta/SecurityIdentity.hpp"
+#include "cta/StorageClass.hpp"
+#include "cta/Tape.hpp"
+#include "cta/TapePool.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <list>
 #include <stdint.h>
diff --git a/libs/middletier/MiddleTierUser.cpp b/middletier/cta/MiddleTierUser.cpp
similarity index 87%
rename from libs/middletier/MiddleTierUser.cpp
rename to middletier/cta/MiddleTierUser.cpp
index cb1d1472c4..7be52d8fde 100644
--- a/libs/middletier/MiddleTierUser.cpp
+++ b/middletier/cta/MiddleTierUser.cpp
@@ -1,4 +1,4 @@
-#include "MiddleTierUser.hpp"
+#include "cta/MiddleTierUser.hpp"
 
 //------------------------------------------------------------------------------
 // destructor
diff --git a/libs/middletier/MiddleTierUser.hpp b/middletier/cta/MiddleTierUser.hpp
similarity index 95%
rename from libs/middletier/MiddleTierUser.hpp
rename to middletier/cta/MiddleTierUser.hpp
index bcc514b75b..0992f43d33 100644
--- a/libs/middletier/MiddleTierUser.hpp
+++ b/middletier/cta/MiddleTierUser.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "ArchivalJob.hpp"
-#include "ArchiveRoute.hpp"
-#include "DirectoryIterator.hpp"
-#include "LogicalLibrary.hpp"
-#include "RetrievalJob.hpp"
-#include "SecurityIdentity.hpp"
-#include "StorageClass.hpp"
-#include "Tape.hpp"
-#include "TapePool.hpp"
-#include "UserIdentity.hpp"
+#include "cta/ArchivalJob.hpp"
+#include "cta/ArchiveRoute.hpp"
+#include "cta/DirectoryIterator.hpp"
+#include "cta/LogicalLibrary.hpp"
+#include "cta/RetrievalJob.hpp"
+#include "cta/SecurityIdentity.hpp"
+#include "cta/StorageClass.hpp"
+#include "cta/Tape.hpp"
+#include "cta/TapePool.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <list>
 #include <map>
diff --git a/libs/middletier/RetrievalJob.cpp b/middletier/cta/RetrievalJob.cpp
similarity index 98%
rename from libs/middletier/RetrievalJob.cpp
rename to middletier/cta/RetrievalJob.cpp
index f1336cd234..bb9dac4afa 100644
--- a/libs/middletier/RetrievalJob.cpp
+++ b/middletier/cta/RetrievalJob.cpp
@@ -1,4 +1,4 @@
-#include "RetrievalJob.hpp"
+#include "cta/RetrievalJob.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/RetrievalJob.hpp b/middletier/cta/RetrievalJob.hpp
similarity index 97%
rename from libs/middletier/RetrievalJob.hpp
rename to middletier/cta/RetrievalJob.hpp
index 5f11eaf8e3..d2b424e209 100644
--- a/libs/middletier/RetrievalJob.hpp
+++ b/middletier/cta/RetrievalJob.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "RetrievalJobState.hpp"
-#include "UserIdentity.hpp"
+#include "cta/RetrievalJobState.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 #include <time.h>
diff --git a/libs/middletier/RetrievalJobState.cpp b/middletier/cta/RetrievalJobState.cpp
similarity index 93%
rename from libs/middletier/RetrievalJobState.cpp
rename to middletier/cta/RetrievalJobState.cpp
index ee514a7c60..014685999e 100644
--- a/libs/middletier/RetrievalJobState.cpp
+++ b/middletier/cta/RetrievalJobState.cpp
@@ -1,4 +1,4 @@
-#include "RetrievalJob.hpp"
+#include "cta/RetrievalJob.hpp"
 
 //------------------------------------------------------------------------------
 // toStr
diff --git a/libs/middletier/RetrievalJobState.hpp b/middletier/cta/RetrievalJobState.hpp
similarity index 100%
rename from libs/middletier/RetrievalJobState.hpp
rename to middletier/cta/RetrievalJobState.hpp
diff --git a/libs/middletier/SecurityIdentity.cpp b/middletier/cta/SecurityIdentity.cpp
similarity index 93%
rename from libs/middletier/SecurityIdentity.cpp
rename to middletier/cta/SecurityIdentity.cpp
index c15aeeb03d..2027cbcd32 100644
--- a/libs/middletier/SecurityIdentity.cpp
+++ b/middletier/cta/SecurityIdentity.cpp
@@ -1,4 +1,4 @@
-#include "SecurityIdentity.hpp"
+#include "cta/SecurityIdentity.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/SecurityIdentity.hpp b/middletier/cta/SecurityIdentity.hpp
similarity index 94%
rename from libs/middletier/SecurityIdentity.hpp
rename to middletier/cta/SecurityIdentity.hpp
index 762f9ee59a..d2062c7669 100644
--- a/libs/middletier/SecurityIdentity.hpp
+++ b/middletier/cta/SecurityIdentity.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/SqliteDatabase.cpp b/middletier/cta/SqliteDatabase.cpp
similarity index 99%
rename from libs/middletier/SqliteDatabase.cpp
rename to middletier/cta/SqliteDatabase.cpp
index 728185ffbf..c7d31fa867 100644
--- a/libs/middletier/SqliteDatabase.cpp
+++ b/middletier/cta/SqliteDatabase.cpp
@@ -1,6 +1,6 @@
-#include "Exception.hpp"
-#include "SqliteDatabase.hpp"
-#include "Utils.hpp"
+#include "cta/Exception.hpp"
+#include "cta/SqliteDatabase.hpp"
+#include "cta/Utils.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/libs/middletier/SqliteDatabase.hpp b/middletier/cta/SqliteDatabase.hpp
similarity index 93%
rename from libs/middletier/SqliteDatabase.hpp
rename to middletier/cta/SqliteDatabase.hpp
index 0bc9bc037c..0f85524b83 100644
--- a/libs/middletier/SqliteDatabase.hpp
+++ b/middletier/cta/SqliteDatabase.hpp
@@ -5,16 +5,16 @@
 
 #include <sqlite3.h>
 
-#include "AdminHost.hpp"
-#include "AdminUser.hpp"
-#include "ArchivalJob.hpp"
-#include "ArchiveRoute.hpp"
-#include "LogicalLibrary.hpp"
-#include "RetrievalJob.hpp"
-#include "SecurityIdentity.hpp"
-#include "StorageClass.hpp"
-#include "Tape.hpp"
-#include "TapePool.hpp"
+#include "cta/AdminHost.hpp"
+#include "cta/AdminUser.hpp"
+#include "cta/ArchivalJob.hpp"
+#include "cta/ArchiveRoute.hpp"
+#include "cta/LogicalLibrary.hpp"
+#include "cta/RetrievalJob.hpp"
+#include "cta/SecurityIdentity.hpp"
+#include "cta/StorageClass.hpp"
+#include "cta/Tape.hpp"
+#include "cta/TapePool.hpp"
 
 namespace cta {
 
diff --git a/libs/middletier/SqliteMiddleTierAdmin.cpp b/middletier/cta/SqliteMiddleTierAdmin.cpp
similarity index 99%
rename from libs/middletier/SqliteMiddleTierAdmin.cpp
rename to middletier/cta/SqliteMiddleTierAdmin.cpp
index 6077ab2135..e85a9896ae 100644
--- a/libs/middletier/SqliteMiddleTierAdmin.cpp
+++ b/middletier/cta/SqliteMiddleTierAdmin.cpp
@@ -1,5 +1,5 @@
-#include "Exception.hpp"
-#include "SqliteMiddleTierAdmin.hpp"
+#include "cta/Exception.hpp"
+#include "cta/SqliteMiddleTierAdmin.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/libs/middletier/SqliteMiddleTierAdmin.hpp b/middletier/cta/SqliteMiddleTierAdmin.hpp
similarity index 98%
rename from libs/middletier/SqliteMiddleTierAdmin.hpp
rename to middletier/cta/SqliteMiddleTierAdmin.hpp
index bff3f2fb0a..7931d4ba7e 100644
--- a/libs/middletier/SqliteMiddleTierAdmin.hpp
+++ b/middletier/cta/SqliteMiddleTierAdmin.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "MiddleTierAdmin.hpp"
-#include "SqliteDatabase.hpp"
-#include "Vfs.hpp"
+#include "cta/MiddleTierAdmin.hpp"
+#include "cta/SqliteDatabase.hpp"
+#include "cta/Vfs.hpp"
 
 namespace cta {
 
diff --git a/libs/middletier/SqliteMiddleTierAdminTest.cpp b/middletier/cta/SqliteMiddleTierAdminTest.cpp
similarity index 99%
rename from libs/middletier/SqliteMiddleTierAdminTest.cpp
rename to middletier/cta/SqliteMiddleTierAdminTest.cpp
index a2fc3bf1de..9fc74134e6 100644
--- a/libs/middletier/SqliteMiddleTierAdminTest.cpp
+++ b/middletier/cta/SqliteMiddleTierAdminTest.cpp
@@ -1,5 +1,5 @@
-#include "SqliteMiddleTierAdmin.hpp"
-#include "SqliteMiddleTierUser.hpp"
+#include "cta/SqliteMiddleTierAdmin.hpp"
+#include "cta/SqliteMiddleTierUser.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/libs/middletier/SqliteMiddleTierUser.cpp b/middletier/cta/SqliteMiddleTierUser.cpp
similarity index 99%
rename from libs/middletier/SqliteMiddleTierUser.cpp
rename to middletier/cta/SqliteMiddleTierUser.cpp
index ce343813e0..6f1e6e24f9 100644
--- a/libs/middletier/SqliteMiddleTierUser.cpp
+++ b/middletier/cta/SqliteMiddleTierUser.cpp
@@ -1,6 +1,6 @@
-#include "Exception.hpp"
-#include "SqliteMiddleTierUser.hpp"
-#include "Utils.hpp"
+#include "cta/Exception.hpp"
+#include "cta/SqliteMiddleTierUser.hpp"
+#include "cta/Utils.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/libs/middletier/SqliteMiddleTierUser.hpp b/middletier/cta/SqliteMiddleTierUser.hpp
similarity index 97%
rename from libs/middletier/SqliteMiddleTierUser.hpp
rename to middletier/cta/SqliteMiddleTierUser.hpp
index 394decb934..080e0ee04a 100644
--- a/libs/middletier/SqliteMiddleTierUser.hpp
+++ b/middletier/cta/SqliteMiddleTierUser.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "FileSystemNode.hpp"
-#include "FileSystemStorageClasses.hpp"
-#include "MiddleTierUser.hpp"
-#include "SqliteDatabase.hpp"
-#include "StorageClass.hpp"
-#include "Vfs.hpp"
+#include "cta/FileSystemNode.hpp"
+#include "cta/FileSystemStorageClasses.hpp"
+#include "cta/MiddleTierUser.hpp"
+#include "cta/SqliteDatabase.hpp"
+#include "cta/StorageClass.hpp"
+#include "cta/Vfs.hpp"
 
 namespace cta {
 
diff --git a/libs/middletier/SqliteMiddleTierUserTest.cpp b/middletier/cta/SqliteMiddleTierUserTest.cpp
similarity index 99%
rename from libs/middletier/SqliteMiddleTierUserTest.cpp
rename to middletier/cta/SqliteMiddleTierUserTest.cpp
index 3ab30df7b8..12c8e72683 100644
--- a/libs/middletier/SqliteMiddleTierUserTest.cpp
+++ b/middletier/cta/SqliteMiddleTierUserTest.cpp
@@ -1,5 +1,5 @@
-#include "SqliteMiddleTierAdmin.hpp"
-#include "SqliteMiddleTierUser.hpp"
+#include "cta/SqliteMiddleTierAdmin.hpp"
+#include "cta/SqliteMiddleTierUser.hpp"
 
 #include <gtest/gtest.h>
 #include <set>
diff --git a/libs/middletier/StorageClass.cpp b/middletier/cta/StorageClass.cpp
similarity index 98%
rename from libs/middletier/StorageClass.cpp
rename to middletier/cta/StorageClass.cpp
index 312740901a..cca9d3002f 100644
--- a/libs/middletier/StorageClass.cpp
+++ b/middletier/cta/StorageClass.cpp
@@ -1,4 +1,4 @@
-#include "StorageClass.hpp"
+#include "cta/StorageClass.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/StorageClass.hpp b/middletier/cta/StorageClass.hpp
similarity index 98%
rename from libs/middletier/StorageClass.hpp
rename to middletier/cta/StorageClass.hpp
index ad71370b9d..578ea4e238 100644
--- a/libs/middletier/StorageClass.hpp
+++ b/middletier/cta/StorageClass.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <stdint.h>
 #include <string>
diff --git a/libs/middletier/Tape.cpp b/middletier/cta/Tape.cpp
similarity index 99%
rename from libs/middletier/Tape.cpp
rename to middletier/cta/Tape.cpp
index a4a66f28b0..3ceb41c367 100644
--- a/libs/middletier/Tape.cpp
+++ b/middletier/cta/Tape.cpp
@@ -1,4 +1,4 @@
-#include "Tape.hpp"
+#include "cta/Tape.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/Tape.hpp b/middletier/cta/Tape.hpp
similarity index 98%
rename from libs/middletier/Tape.hpp
rename to middletier/cta/Tape.hpp
index 0d79bd970a..b340011918 100644
--- a/libs/middletier/Tape.hpp
+++ b/middletier/cta/Tape.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/TapePool.cpp b/middletier/cta/TapePool.cpp
similarity index 98%
rename from libs/middletier/TapePool.cpp
rename to middletier/cta/TapePool.cpp
index 244d8b0fda..9457fce077 100644
--- a/libs/middletier/TapePool.cpp
+++ b/middletier/cta/TapePool.cpp
@@ -1,4 +1,4 @@
-#include "TapePool.hpp"
+#include "cta/TapePool.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/TapePool.hpp b/middletier/cta/TapePool.hpp
similarity index 98%
rename from libs/middletier/TapePool.hpp
rename to middletier/cta/TapePool.hpp
index 4bc122b19c..897f80c8c4 100644
--- a/libs/middletier/TapePool.hpp
+++ b/middletier/cta/TapePool.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 #include <string>
 
diff --git a/libs/middletier/UserIdentity.cpp b/middletier/cta/UserIdentity.cpp
similarity index 97%
rename from libs/middletier/UserIdentity.cpp
rename to middletier/cta/UserIdentity.cpp
index 637fda7d46..3d4a09930e 100644
--- a/libs/middletier/UserIdentity.cpp
+++ b/middletier/cta/UserIdentity.cpp
@@ -1,4 +1,4 @@
-#include "UserIdentity.hpp"
+#include "cta/UserIdentity.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/libs/middletier/UserIdentity.hpp b/middletier/cta/UserIdentity.hpp
similarity index 100%
rename from libs/middletier/UserIdentity.hpp
rename to middletier/cta/UserIdentity.hpp
diff --git a/libs/middletier/Utils.cpp b/middletier/cta/Utils.cpp
similarity index 99%
rename from libs/middletier/Utils.cpp
rename to middletier/cta/Utils.cpp
index fec9cece5e..e44f2c851b 100644
--- a/libs/middletier/Utils.cpp
+++ b/middletier/cta/Utils.cpp
@@ -1,5 +1,5 @@
-#include "Exception.hpp"
-#include "Utils.hpp"
+#include "cta/Exception.hpp"
+#include "cta/Utils.hpp"
 
 #include <sstream>
 
diff --git a/libs/middletier/Utils.hpp b/middletier/cta/Utils.hpp
similarity index 100%
rename from libs/middletier/Utils.hpp
rename to middletier/cta/Utils.hpp
diff --git a/libs/middletier/UtilsTest.cpp b/middletier/cta/UtilsTest.cpp
similarity index 99%
rename from libs/middletier/UtilsTest.cpp
rename to middletier/cta/UtilsTest.cpp
index 37ca0c54f8..f0e375a437 100644
--- a/libs/middletier/UtilsTest.cpp
+++ b/middletier/cta/UtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Utils.hpp"
+#include "cta/Utils.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/libs/middletier/Vfs.cpp b/middletier/cta/Vfs.cpp
similarity index 99%
rename from libs/middletier/Vfs.cpp
rename to middletier/cta/Vfs.cpp
index 3f9f33bfa0..793761ef96 100644
--- a/libs/middletier/Vfs.cpp
+++ b/middletier/cta/Vfs.cpp
@@ -10,9 +10,9 @@
 #include <attr/xattr.h>
 #include <fcntl.h>
 
-#include "Exception.hpp"
-#include "Utils.hpp"
-#include "Vfs.hpp"
+#include "cta/Exception.hpp"
+#include "cta/Utils.hpp"
+#include "cta/Vfs.hpp"
 
 //------------------------------------------------------------------------------
 // checkDirectoryExists
diff --git a/libs/middletier/Vfs.hpp b/middletier/cta/Vfs.hpp
similarity index 96%
rename from libs/middletier/Vfs.hpp
rename to middletier/cta/Vfs.hpp
index e3e57293d6..c452aee6ac 100644
--- a/libs/middletier/Vfs.hpp
+++ b/middletier/cta/Vfs.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DirectoryIterator.hpp"
-#include "SecurityIdentity.hpp"
+#include "cta/DirectoryIterator.hpp"
+#include "cta/SecurityIdentity.hpp"
 
 namespace cta {
 
diff --git a/libs/middletier/VfsTest.cpp b/middletier/cta/VfsTest.cpp
similarity index 99%
rename from libs/middletier/VfsTest.cpp
rename to middletier/cta/VfsTest.cpp
index be358c588e..6958773c9f 100644
--- a/libs/middletier/VfsTest.cpp
+++ b/middletier/cta/VfsTest.cpp
@@ -1,4 +1,4 @@
-#include "Vfs.hpp"
+#include "cta/Vfs.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/objectstore/AdminUsersList.hpp b/objectstore/AdminUsersList.hpp
index cfbf0ac42b..6c5628c625 100644
--- a/objectstore/AdminUsersList.hpp
+++ b/objectstore/AdminUsersList.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "cta/AdminUser.hpp"
 #include "ObjectOps.hpp"
 #include "objectstore/cta.pb.h"
-#include "libs/middletier/AdminUser.hpp"
 
 namespace cta { namespace objectstore {
 
@@ -19,4 +19,4 @@ public:
   void add(const cta::AdminUser & adminUser);
 };
 
-}}
\ No newline at end of file
+}}
diff --git a/objectstore/CMakeLists.txt b/objectstore/CMakeLists.txt
index f24a7b4a12..d2a8c4507f 100644
--- a/objectstore/CMakeLists.txt
+++ b/objectstore/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
 include_directories(${CMAKE_BINARY_DIR})
 
 find_package(Protobuf)
@@ -66,4 +67,4 @@ set(ObjectStoreUnitTests
 
 add_executable(unitTests unitTests.cpp ${ObjectStoreUnitTests})
 target_link_libraries(unitTests
-  protobuf rados CTAObjectStore gtest gmock)
\ No newline at end of file
+  protobuf rados CTAObjectStore gtest gmock)
diff --git a/objectstore/exception/Errnum.cpp b/objectstore/exception/Errnum.cpp
index 4f88157e9b..4108e3ca08 100644
--- a/objectstore/exception/Errnum.cpp
+++ b/objectstore/exception/Errnum.cpp
@@ -22,8 +22,8 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "exception/Errnum.hpp"
-#include "exception/strerror_r_wrapper.h"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/strerror_r_wrapper.h"
 #include <string.h>
 #include <errno.h>
 
diff --git a/objectstore/exception/Exception.cpp b/objectstore/exception/Exception.cpp
index ec6b2e3cfb..8f592e4e71 100644
--- a/objectstore/exception/Exception.cpp
+++ b/objectstore/exception/Exception.cpp
@@ -22,7 +22,7 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "exception/Exception.hpp"
+#include "objectstore/exception/Exception.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/objectstore/threading/ChildProcess.hpp b/objectstore/threading/ChildProcess.hpp
index b2c4c51aab..594ec344bb 100644
--- a/objectstore/threading/ChildProcess.hpp
+++ b/objectstore/threading/ChildProcess.hpp
@@ -22,8 +22,8 @@
  *****************************************************************************/
 #pragma once
 
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
 #include <unistd.h>
 
 
diff --git a/objectstore/threading/Mutex.cpp b/objectstore/threading/Mutex.cpp
index 0be4f3c17f..985ccf0096 100644
--- a/objectstore/threading/Mutex.cpp
+++ b/objectstore/threading/Mutex.cpp
@@ -1,6 +1,6 @@
-#include "threading/Mutex.hpp"
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
+#include "objectstore/threading/Mutex.hpp"
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
 
 //------------------------------------------------------------------------------
 //constructor
diff --git a/objectstore/threading/Threading.hpp b/objectstore/threading/Threading.hpp
index fbc508d855..0c2f23aaca 100644
--- a/objectstore/threading/Threading.hpp
+++ b/objectstore/threading/Threading.hpp
@@ -23,11 +23,12 @@
 
 #pragma once
 
+#include "objectstore/exception/Errnum.hpp"
+#include "objectstore/exception/Exception.hpp"
+#include "objectstore/threading/Mutex.hpp"
+
 #include <pthread.h>
 #include <semaphore.h>
-#include "exception/Errnum.hpp"
-#include "exception/Exception.hpp"
-#include "threading/Mutex.hpp"
 
 namespace cta {
 namespace threading { 
diff --git a/objectstore_middletier/CMakeLists.txt b/objectstore_middletier/CMakeLists.txt
index 6df1a3271c..ebb62593ce 100644
--- a/objectstore_middletier/CMakeLists.txt
+++ b/objectstore_middletier/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required (VERSION 2.6)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
 include_directories(${CMAKE_BINARY_DIR})
 
 add_library (CTAObjectStoreMiddleTier
   ObjectStoreMiddleTier.cpp
-)
\ No newline at end of file
+)
diff --git a/objectstore_middletier/ObjectStoreMiddleTier.cpp b/objectstore_middletier/ObjectStoreMiddleTier.cpp
index 5affbd7aac..2eb3364725 100644
--- a/objectstore_middletier/ObjectStoreMiddleTier.cpp
+++ b/objectstore_middletier/ObjectStoreMiddleTier.cpp
@@ -1,8 +1,8 @@
+#include "cta/Exception.hpp"
 #include "ObjectStoreMiddleTier.hpp"
 #include "objectstore/Backend.hpp"
 #include "objectstore/RootEntry.hpp"
 #include "objectstore/AdminUsersList.hpp"
-#include "../libs/middletier/Exception.hpp"
 
 namespace cta {
 
diff --git a/objectstore_middletier/ObjectStoreMiddleTier.hpp b/objectstore_middletier/ObjectStoreMiddleTier.hpp
index 1683594ecb..7fd22c7453 100644
--- a/objectstore_middletier/ObjectStoreMiddleTier.hpp
+++ b/objectstore_middletier/ObjectStoreMiddleTier.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../libs/middletier/MiddleTierAdmin.hpp"
+#include "cta/MiddleTierAdmin.hpp"
 
 namespace cta {
 
diff --git a/xroot_plugins/CMakeLists.txt b/xroot_plugins/CMakeLists.txt
index e667173004..27db9fbb49 100644
--- a/xroot_plugins/CMakeLists.txt
+++ b/xroot_plugins/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required (VERSION 2.6)
 
 list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 find_package (xrootd REQUIRED)
-include_directories (${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
+include_directories (${CMAKE_SOURCE_DIR})
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
+include_directories (${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR})
 
 add_library (XrdProFst MODULE XrdProFilesystem.cpp XrdProFile.cpp XrdProDir.cpp ParsedRequest.cpp)
 target_link_libraries (XrdProFst ctamiddletier)
diff --git a/xroot_plugins/XrdProDir.hpp b/xroot_plugins/XrdProDir.hpp
index 160700ea42..8a75dc622e 100644
--- a/xroot_plugins/XrdProDir.hpp
+++ b/xroot_plugins/XrdProDir.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <iostream>
-
+#include "cta/SqliteMiddleTierUser.hpp"
 #include "XrdSec/XrdSecEntity.hh"
 #include "XrdSfs/XrdSfsInterface.hh"
 
-#include "libs/middletier/SqliteMiddleTierUser.hpp"
+#include <iostream>
 
 class XrdProDir : public XrdSfsDirectory
 {
diff --git a/xroot_plugins/XrdProFilesystem.cpp b/xroot_plugins/XrdProFilesystem.cpp
index d95f5ef73d..5d3012302d 100644
--- a/xroot_plugins/XrdProFilesystem.cpp
+++ b/xroot_plugins/XrdProFilesystem.cpp
@@ -1,3 +1,5 @@
+#include "cta/Exception.hpp"
+
 #include "XrdProFilesystem.hpp"
 #include "XrdProFile.hpp"
 #include "XrdProDir.hpp"
@@ -5,7 +7,6 @@
 #include "XrdOuc/XrdOucString.hh"
 #include "XrdSec/XrdSecEntity.hh"
 #include "XrdVersion.hh"
-#include "libs/middletier/Exception.hpp"
 
 #include <iostream>
 #include <pwd.h>
diff --git a/xroot_plugins/XrdProFilesystem.hpp b/xroot_plugins/XrdProFilesystem.hpp
index d844e5fc4b..485476bedb 100644
--- a/xroot_plugins/XrdProFilesystem.hpp
+++ b/xroot_plugins/XrdProFilesystem.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "libs/middletier/SqliteMiddleTierAdmin.hpp"
-#include "libs/middletier/SqliteMiddleTierUser.hpp"
+#include "cta/SqliteMiddleTierAdmin.hpp"
+#include "cta/SqliteMiddleTierUser.hpp"
 #include "XrdSfs/XrdSfsInterface.hh"
 
 #include "ParsedRequest.hpp"
-- 
GitLab