diff --git a/.gitignore b/.gitignore
index 86d8a7d21..a97fb8b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,42 @@
 .DS_Store
 
 node_modules
 
 landing/node_modules
 landing/dist
 
 lib/node_modules
 
 web/node_modules
 web/dist
 
 keyserver/dist
 keyserver/node_modules
 keyserver/secrets
 keyserver/facts
 keyserver/*.env
 keyserver/*.env.*
 
 services/tunnelbroker/target
 services/tunnelbroker/src/libcpp/test/build
 
 .eslintcache
 .vscode
 !.vscode/extensions.json
 
 # CMake
 native/cpp/**/build
 services/*/build
 services/build
 services/lib/src/build
 shared/protos/build
 
 # Nix
 result*
-services/backup/blob_client/target/
+services/backup/old/blob_client/target/
 .direnv
 
 # Electron
 desktop/out/
 desktop/assets/
 desktop/dist/
diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile
index c25ef6121..29382c6c3 100644
--- a/services/backup/Dockerfile
+++ b/services/backup/Dockerfile
@@ -1,30 +1,30 @@
 FROM commapp/services-base:1.3.2
 
 RUN apt-get update && \
   apt-get install -y uuid-dev && \
   rm -rf /var/lib/apt/lists/*
 
 ARG COMM_TEST_SERVICES
 ARG COMM_SERVICES_SANDBOX
 
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
 ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}
 
 # install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 WORKDIR /transferred/services/backup
 
 COPY services/lib/docker/ scripts/
 
 RUN scripts/install_corrosion.sh
 
 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/lib/src/ /transferred/services/lib/src/
 
 RUN scripts/build_service.sh
 
 CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi
diff --git a/services/backup/CMakeLists.txt b/services/backup/old/CMakeLists.txt
similarity index 100%
rename from services/backup/CMakeLists.txt
rename to services/backup/old/CMakeLists.txt
diff --git a/services/backup/blob_client/Cargo.lock b/services/backup/old/blob_client/Cargo.lock
similarity index 100%
rename from services/backup/blob_client/Cargo.lock
rename to services/backup/old/blob_client/Cargo.lock
diff --git a/services/backup/blob_client/Cargo.toml b/services/backup/old/blob_client/Cargo.toml
similarity index 100%
rename from services/backup/blob_client/Cargo.toml
rename to services/backup/old/blob_client/Cargo.toml
diff --git a/services/backup/blob_client/build.rs b/services/backup/old/blob_client/build.rs
similarity index 100%
rename from services/backup/blob_client/build.rs
rename to services/backup/old/blob_client/build.rs
diff --git a/services/backup/blob_client/src/constants.rs b/services/backup/old/blob_client/src/constants.rs
similarity index 100%
rename from services/backup/blob_client/src/constants.rs
rename to services/backup/old/blob_client/src/constants.rs
diff --git a/services/backup/blob_client/src/get_client.rs b/services/backup/old/blob_client/src/get_client.rs
similarity index 100%
rename from services/backup/blob_client/src/get_client.rs
rename to services/backup/old/blob_client/src/get_client.rs
diff --git a/services/backup/blob_client/src/lib.rs b/services/backup/old/blob_client/src/lib.rs
similarity index 100%
rename from services/backup/blob_client/src/lib.rs
rename to services/backup/old/blob_client/src/lib.rs
diff --git a/services/backup/blob_client/src/put_client.rs b/services/backup/old/blob_client/src/put_client.rs
similarity index 100%
rename from services/backup/blob_client/src/put_client.rs
rename to services/backup/old/blob_client/src/put_client.rs
diff --git a/services/backup/src/BackupServiceImpl.cpp b/services/backup/old/src/BackupServiceImpl.cpp
similarity index 100%
rename from services/backup/src/BackupServiceImpl.cpp
rename to services/backup/old/src/BackupServiceImpl.cpp
diff --git a/services/backup/src/BackupServiceImpl.h b/services/backup/old/src/BackupServiceImpl.h
similarity index 100%
rename from services/backup/src/BackupServiceImpl.h
rename to services/backup/old/src/BackupServiceImpl.h
diff --git a/services/backup/src/Constants.h b/services/backup/old/src/Constants.h
similarity index 100%
rename from services/backup/src/Constants.h
rename to services/backup/old/src/Constants.h
diff --git a/services/backup/src/DatabaseEntities/BackupItem.cpp b/services/backup/old/src/DatabaseEntities/BackupItem.cpp
similarity index 100%
rename from services/backup/src/DatabaseEntities/BackupItem.cpp
rename to services/backup/old/src/DatabaseEntities/BackupItem.cpp
diff --git a/services/backup/src/DatabaseEntities/BackupItem.h b/services/backup/old/src/DatabaseEntities/BackupItem.h
similarity index 100%
rename from services/backup/src/DatabaseEntities/BackupItem.h
rename to services/backup/old/src/DatabaseEntities/BackupItem.h
diff --git a/services/backup/src/DatabaseEntities/LogItem.cpp b/services/backup/old/src/DatabaseEntities/LogItem.cpp
similarity index 100%
rename from services/backup/src/DatabaseEntities/LogItem.cpp
rename to services/backup/old/src/DatabaseEntities/LogItem.cpp
diff --git a/services/backup/src/DatabaseEntities/LogItem.h b/services/backup/old/src/DatabaseEntities/LogItem.h
similarity index 100%
rename from services/backup/src/DatabaseEntities/LogItem.h
rename to services/backup/old/src/DatabaseEntities/LogItem.h
diff --git a/services/backup/src/DatabaseManager.cpp b/services/backup/old/src/DatabaseManager.cpp
similarity index 100%
rename from services/backup/src/DatabaseManager.cpp
rename to services/backup/old/src/DatabaseManager.cpp
diff --git a/services/backup/src/DatabaseManager.h b/services/backup/old/src/DatabaseManager.h
similarity index 100%
rename from services/backup/src/DatabaseManager.h
rename to services/backup/old/src/DatabaseManager.h
diff --git a/services/backup/src/Reactors/server/AddAttachmentsUtility.cpp b/services/backup/old/src/Reactors/server/AddAttachmentsUtility.cpp
similarity index 100%
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/AddAttachmentsUtility.h b/services/backup/old/src/Reactors/server/AddAttachmentsUtility.h
similarity index 100%
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/CreateNewBackupReactor.cpp b/services/backup/old/src/Reactors/server/CreateNewBackupReactor.cpp
similarity index 100%
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/CreateNewBackupReactor.h b/services/backup/old/src/Reactors/server/CreateNewBackupReactor.h
similarity index 100%
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/PullBackupReactor.cpp b/services/backup/old/src/Reactors/server/PullBackupReactor.cpp
similarity index 100%
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/PullBackupReactor.h b/services/backup/old/src/Reactors/server/PullBackupReactor.h
similarity index 100%
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/RecoverBackupKeyReactor.h b/services/backup/old/src/Reactors/server/RecoverBackupKeyReactor.h
similarity index 100%
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.cpp b/services/backup/old/src/Reactors/server/SendLogReactor.cpp
similarity index 100%
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/Reactors/server/SendLogReactor.h b/services/backup/old/src/Reactors/server/SendLogReactor.h
similarity index 100%
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/Tools.cpp b/services/backup/old/src/Tools.cpp
similarity index 100%
rename from services/backup/src/Tools.cpp
rename to services/backup/old/src/Tools.cpp
diff --git a/services/backup/src/Tools.h b/services/backup/old/src/Tools.h
similarity index 100%
rename from services/backup/src/Tools.h
rename to services/backup/old/src/Tools.h
diff --git a/services/backup/src/server.cpp b/services/backup/old/src/server.cpp
similarity index 100%
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
similarity index 100%
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
similarity index 100%
rename from services/backup/test/DatabaseManagerTest.cpp
rename to services/backup/old/test/DatabaseManagerTest.cpp