diff --git a/scripts/get_clang_paths.js b/scripts/get_clang_paths.js
index 743219d72..d0e1e4994 100644
--- a/scripts/get_clang_paths.js
+++ b/scripts/get_clang_paths.js
@@ -1,40 +1,40 @@
 // @flow
 
 const clangPaths = [
   {
     path: 'native/cpp/CommonCpp',
     extensions: ['h', 'cpp'],
     excludes: ['_generated'],
   },
   {
     path: 'services/tunnelbroker/docker-server/contents/server/src',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/backup/contents/server/src',
+    path: 'services/backup/docker-server/contents/server/src',
     extensions: ['cpp', 'h'],
   },
   {
     path: 'native/android/app/src/cpp',
     extensions: ['cpp', 'h'],
   },
   {
     path: 'native/ios/Comm',
     extensions: ['h', 'm', 'mm'],
   },
   {
     path: 'native/ios/CommTests',
     extensions: ['mm'],
   },
   {
     path: 'native/android/app/src/main/java/app/comm',
     extensions: ['java'],
     excludes: ['generated'],
   },
 ];
 
 function getClangPaths() {
   return clangPaths.map(pathItem => pathItem.path);
 }
 
 module.exports = { getClangPaths, clangPaths };
diff --git a/services/backup/docker-base/Dockerfile b/services/backup/docker-base/Dockerfile
index 98a2be46b..49baf1d11 100644
--- a/services/backup/docker-base/Dockerfile
+++ b/services/backup/docker-base/Dockerfile
@@ -1,12 +1,12 @@
 FROM commapp/services-base:1.0
 
 ENV SHELL=/bin/bash
 
-COPY services/backup/contents /transferred
+COPY services/backup/docker-base/contents /transferred
 
-RUN apk update &&\
-  apk add curl-dev openssl-dev libuuid zlib-dev &&\
-  cd / &&\
-  /transferred/install_aws_sdk.sh
+RUN apk update
+RUN apk add curl-dev openssl-dev libuuid zlib-dev
+RUN cd /
+RUN /transferred/install_aws_sdk.sh
 
 CMD /bin/bash
diff --git a/services/backup/docker-base/config.sh b/services/backup/docker-base/config.sh
deleted file mode 100755
index b3d205830..000000000
--- a/services/backup/docker-base/config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#/bin/bash
-
-set -e
-
-IMAGE_NAME="commapp/backup-base"
-VERSION="1.0"
diff --git a/services/backup/contents/install_aws_sdk.sh b/services/backup/docker-base/contents/install_aws_sdk.sh
similarity index 100%
rename from services/backup/contents/install_aws_sdk.sh
rename to services/backup/docker-base/contents/install_aws_sdk.sh
diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile
index addcee509..6820339fb 100644
--- a/services/backup/docker-server/Dockerfile
+++ b/services/backup/docker-server/Dockerfile
@@ -1,10 +1,10 @@
 FROM commapp/backup-base:1.0
 
 ENV SHELL=/bin/bash
 
-COPY services/backup/contents /transferred
+COPY services/backup/docker-server/contents /transferred
 COPY native/cpp/CommonCpp/grpc/protos/backup.proto /transferred/server/protos/backup.proto
 
 RUN /transferred/build_server.sh
 
 CMD /transferred/run_server.sh && /bin/bash
diff --git a/services/backup/docker-server/config.sh b/services/backup/docker-server/config.sh
deleted file mode 100755
index 5de410789..000000000
--- a/services/backup/docker-server/config.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/bash
-
-set -e
-
-# this script should be run from the comm's root directory
-
-IMAGE_NAME="commapp/backup-server"
-VERSION="1.0"
-EXTRA_ARGS="-v $HOME/.aws/credentials:/root/.aws/credentials:ro"
diff --git a/services/backup/contents/build_server.sh b/services/backup/docker-server/contents/build_server.sh
similarity index 100%
rename from services/backup/contents/build_server.sh
rename to services/backup/docker-server/contents/build_server.sh
diff --git a/services/backup/contents/run_server.sh b/services/backup/docker-server/contents/run_server.sh
similarity index 100%
rename from services/backup/contents/run_server.sh
rename to services/backup/docker-server/contents/run_server.sh
diff --git a/services/backup/contents/server/CMakeLists.txt b/services/backup/docker-server/contents/server/CMakeLists.txt
similarity index 100%
rename from services/backup/contents/server/CMakeLists.txt
rename to services/backup/docker-server/contents/server/CMakeLists.txt
diff --git a/services/backup/contents/server/build.sh b/services/backup/docker-server/contents/server/build.sh
similarity index 100%
rename from services/backup/contents/server/build.sh
rename to services/backup/docker-server/contents/server/build.sh
diff --git a/services/backup/contents/server/generate.sh b/services/backup/docker-server/contents/server/generate.sh
similarity index 100%
rename from services/backup/contents/server/generate.sh
rename to services/backup/docker-server/contents/server/generate.sh
diff --git a/services/backup/contents/server/src/AwsS3Bucket.cpp b/services/backup/docker-server/contents/server/src/AwsS3Bucket.cpp
similarity index 100%
rename from services/backup/contents/server/src/AwsS3Bucket.cpp
rename to services/backup/docker-server/contents/server/src/AwsS3Bucket.cpp
diff --git a/services/backup/contents/server/src/AwsS3Bucket.h b/services/backup/docker-server/contents/server/src/AwsS3Bucket.h
similarity index 100%
rename from services/backup/contents/server/src/AwsS3Bucket.h
rename to services/backup/docker-server/contents/server/src/AwsS3Bucket.h
diff --git a/services/backup/contents/server/src/AwsStorageManager.cpp b/services/backup/docker-server/contents/server/src/AwsStorageManager.cpp
similarity index 100%
rename from services/backup/contents/server/src/AwsStorageManager.cpp
rename to services/backup/docker-server/contents/server/src/AwsStorageManager.cpp
diff --git a/services/backup/contents/server/src/AwsStorageManager.h b/services/backup/docker-server/contents/server/src/AwsStorageManager.h
similarity index 100%
rename from services/backup/contents/server/src/AwsStorageManager.h
rename to services/backup/docker-server/contents/server/src/AwsStorageManager.h
diff --git a/services/backup/contents/server/src/BackupServiceImpl.cpp b/services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp
similarity index 100%
rename from services/backup/contents/server/src/BackupServiceImpl.cpp
rename to services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp
diff --git a/services/backup/contents/server/src/BackupServiceImpl.h b/services/backup/docker-server/contents/server/src/BackupServiceImpl.h
similarity index 100%
rename from services/backup/contents/server/src/BackupServiceImpl.h
rename to services/backup/docker-server/contents/server/src/BackupServiceImpl.h
diff --git a/services/backup/contents/server/src/MultiPartUploader.cpp b/services/backup/docker-server/contents/server/src/MultiPartUploader.cpp
similarity index 100%
rename from services/backup/contents/server/src/MultiPartUploader.cpp
rename to services/backup/docker-server/contents/server/src/MultiPartUploader.cpp
diff --git a/services/backup/contents/server/src/MultiPartUploader.h b/services/backup/docker-server/contents/server/src/MultiPartUploader.h
similarity index 100%
rename from services/backup/contents/server/src/MultiPartUploader.h
rename to services/backup/docker-server/contents/server/src/MultiPartUploader.h
diff --git a/services/backup/contents/server/src/Tools.h b/services/backup/docker-server/contents/server/src/Tools.h
similarity index 100%
rename from services/backup/contents/server/src/Tools.h
rename to services/backup/docker-server/contents/server/src/Tools.h
diff --git a/services/backup/contents/server/src/server.cpp b/services/backup/docker-server/contents/server/src/server.cpp
similarity index 100%
rename from services/backup/contents/server/src/server.cpp
rename to services/backup/docker-server/contents/server/src/server.cpp