diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile
--- a/services/backup/Dockerfile
+++ b/services/backup/Dockerfile
@@ -22,7 +22,8 @@
 ADD shared/protos /transferred/shared/protos/
 ADD shared/cmake /transferred/shared/cmake/
 
-COPY services/backup/ /transferred/services/backup/
+COPY services/backup/old/ /transferred/services/backup/
+COPY services/backup/blob_client/ /transferred/services/backup/blob_client/
 COPY services/lib/src/ /transferred/services/lib/src/
 
 RUN scripts/build_service.sh
diff --git a/services/backup/CMakeLists.txt b/services/backup/old/CMakeLists.txt
rename from services/backup/CMakeLists.txt
rename to services/backup/old/CMakeLists.txt
--- a/services/backup/CMakeLists.txt
+++ b/services/backup/old/CMakeLists.txt
@@ -51,7 +51,15 @@
   ${SOURCE_CODE}
 )
 
-add_library_rust(PATH blob_client NAMESPACE backup)
+if(${CMAKE_CURRENT_SOURCE_DIR} MATCHES "^\/transferred.*")
+  # Inside the docker build contex
+  set(_blob_client_path "blob_client")
+else()
+  # Inside repo
+  set(_blob_client_path "../blob_client")
+endif()
+
+add_library_rust(PATH ${_blob_client_path} NAMESPACE backup)
 
 set(INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/services/backup/src/BackupServiceImpl.h b/services/backup/old/src/BackupServiceImpl.h
rename from services/backup/src/BackupServiceImpl.h
rename to services/backup/old/src/BackupServiceImpl.h
diff --git a/services/backup/src/BackupServiceImpl.cpp b/services/backup/old/src/BackupServiceImpl.cpp
rename from services/backup/src/BackupServiceImpl.cpp
rename to services/backup/old/src/BackupServiceImpl.cpp
diff --git a/services/backup/src/Constants.h b/services/backup/old/src/Constants.h
rename from services/backup/src/Constants.h
rename to services/backup/old/src/Constants.h
diff --git a/services/backup/src/DatabaseEntities/BackupItem.h b/services/backup/old/src/DatabaseEntities/BackupItem.h
rename from services/backup/src/DatabaseEntities/BackupItem.h
rename to services/backup/old/src/DatabaseEntities/BackupItem.h
diff --git a/services/backup/src/DatabaseEntities/BackupItem.cpp b/services/backup/old/src/DatabaseEntities/BackupItem.cpp
rename from services/backup/src/DatabaseEntities/BackupItem.cpp
rename to services/backup/old/src/DatabaseEntities/BackupItem.cpp
diff --git a/services/backup/src/DatabaseEntities/LogItem.h b/services/backup/old/src/DatabaseEntities/LogItem.h
rename from services/backup/src/DatabaseEntities/LogItem.h
rename to services/backup/old/src/DatabaseEntities/LogItem.h
diff --git a/services/backup/src/DatabaseEntities/LogItem.cpp b/services/backup/old/src/DatabaseEntities/LogItem.cpp
rename from services/backup/src/DatabaseEntities/LogItem.cpp
rename to services/backup/old/src/DatabaseEntities/LogItem.cpp
diff --git a/services/backup/src/DatabaseManager.h b/services/backup/old/src/DatabaseManager.h
rename from services/backup/src/DatabaseManager.h
rename to services/backup/old/src/DatabaseManager.h
diff --git a/services/backup/src/DatabaseManager.cpp b/services/backup/old/src/DatabaseManager.cpp
rename from services/backup/src/DatabaseManager.cpp
rename to services/backup/old/src/DatabaseManager.cpp
diff --git a/services/backup/src/Reactors/server/AddAttachmentsUtility.h b/services/backup/old/src/Reactors/server/AddAttachmentsUtility.h
rename from services/backup/src/Reactors/server/AddAttachmentsUtility.h
rename to services/backup/old/src/Reactors/server/AddAttachmentsUtility.h
diff --git a/services/backup/src/Reactors/server/AddAttachmentsUtility.cpp b/services/backup/old/src/Reactors/server/AddAttachmentsUtility.cpp
rename from services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
rename to services/backup/old/src/Reactors/server/AddAttachmentsUtility.cpp
diff --git a/services/backup/src/Reactors/server/CreateNewBackupReactor.h b/services/backup/old/src/Reactors/server/CreateNewBackupReactor.h
rename from services/backup/src/Reactors/server/CreateNewBackupReactor.h
rename to services/backup/old/src/Reactors/server/CreateNewBackupReactor.h
diff --git a/services/backup/src/Reactors/server/CreateNewBackupReactor.cpp b/services/backup/old/src/Reactors/server/CreateNewBackupReactor.cpp
rename from services/backup/src/Reactors/server/CreateNewBackupReactor.cpp
rename to services/backup/old/src/Reactors/server/CreateNewBackupReactor.cpp
diff --git a/services/backup/src/Reactors/server/PullBackupReactor.h b/services/backup/old/src/Reactors/server/PullBackupReactor.h
rename from services/backup/src/Reactors/server/PullBackupReactor.h
rename to services/backup/old/src/Reactors/server/PullBackupReactor.h
diff --git a/services/backup/src/Reactors/server/PullBackupReactor.cpp b/services/backup/old/src/Reactors/server/PullBackupReactor.cpp
rename from services/backup/src/Reactors/server/PullBackupReactor.cpp
rename to services/backup/old/src/Reactors/server/PullBackupReactor.cpp
diff --git a/services/backup/src/Reactors/server/RecoverBackupKeyReactor.h b/services/backup/old/src/Reactors/server/RecoverBackupKeyReactor.h
rename from services/backup/src/Reactors/server/RecoverBackupKeyReactor.h
rename to services/backup/old/src/Reactors/server/RecoverBackupKeyReactor.h
diff --git a/services/backup/src/Reactors/server/SendLogReactor.h b/services/backup/old/src/Reactors/server/SendLogReactor.h
rename from services/backup/src/Reactors/server/SendLogReactor.h
rename to services/backup/old/src/Reactors/server/SendLogReactor.h
diff --git a/services/backup/src/Reactors/server/SendLogReactor.cpp b/services/backup/old/src/Reactors/server/SendLogReactor.cpp
rename from services/backup/src/Reactors/server/SendLogReactor.cpp
rename to services/backup/old/src/Reactors/server/SendLogReactor.cpp
diff --git a/services/backup/src/Tools.h b/services/backup/old/src/Tools.h
rename from services/backup/src/Tools.h
rename to services/backup/old/src/Tools.h
diff --git a/services/backup/src/Tools.cpp b/services/backup/old/src/Tools.cpp
rename from services/backup/src/Tools.cpp
rename to services/backup/old/src/Tools.cpp
diff --git a/services/backup/src/server.cpp b/services/backup/old/src/server.cpp
rename from services/backup/src/server.cpp
rename to services/backup/old/src/server.cpp
diff --git a/services/backup/test/BackupTest.cpp b/services/backup/old/test/BackupTest.cpp
rename from services/backup/test/BackupTest.cpp
rename to services/backup/old/test/BackupTest.cpp
diff --git a/services/backup/test/DatabaseManagerTest.cpp b/services/backup/old/test/DatabaseManagerTest.cpp
rename from services/backup/test/DatabaseManagerTest.cpp
rename to services/backup/old/test/DatabaseManagerTest.cpp