diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 8eca23c0c4..33507a235f 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -5,13 +5,13 @@
 ARG SHARELATEX_BASE_TAG=sharelatex/sharelatex-base:latest
 FROM $SHARELATEX_BASE_TAG
 
-WORKDIR /var/www/sharelatex
+WORKDIR /overleaf
 
 # Add required source files
 # -------------------------
-ADD server-ce/genScript.js /var/www/sharelatex/genScript.js
-ADD server-ce/services.js /var/www/sharelatex/services.js
-ADD services/ /var/www/sharelatex/
+ADD server-ce/genScript.js /overleaf/genScript.js
+ADD server-ce/services.js /overleaf/services.js
+ADD services/ /overleaf/services/
 
 # Store the revision
 # ------------------
diff --git a/server-ce/Dockerfile-base b/server-ce/Dockerfile-base
index 278da0e238..b2df708d89 100644
--- a/server-ce/Dockerfile-base
+++ b/server-ce/Dockerfile-base
@@ -68,7 +68,7 @@ RUN mkdir /install-tl-unx \
 
 # Set up sharelatex user and home directory
 # -----------------------------------------
-RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex && \
+RUN adduser --system --group --home /overleaf --no-create-home sharelatex && \
 	mkdir -p /var/lib/sharelatex && \
 	chown www-data:www-data /var/lib/sharelatex && \
 	mkdir -p /var/log/sharelatex && \
diff --git a/server-ce/bin/grunt b/server-ce/bin/grunt
index 03f89b52c7..1af49b2357 100755
--- a/server-ce/bin/grunt
+++ b/server-ce/bin/grunt
@@ -5,23 +5,23 @@ set -e
 TASK="$1"
 shift 1
 
-cd /var/www/sharelatex/web/modules/server-ce-scripts/scripts
+cd /overleaf/services/web
 
 case "$TASK" in
   user:create-admin)
-    node create-user --admin "$@"
+    node modules/server-ce-scripts/scripts/create-user --admin "$@"
     ;;
 
   user:delete)
-    node delete-user "$@"
+    node modules/server-ce-scripts/scripts/delete-user "$@"
     ;;
 
   check:mongo)
-    node check-mongodb
+    node modules/server-ce-scripts/scripts/check-mongodb
     ;;
 
   check:redis)
-    node check-redis
+    node modules/server-ce-scripts/scripts/check-redis
     ;;
 
   *)
diff --git a/server-ce/genScript.js b/server-ce/genScript.js
index e8f61f2ba2..7d635454d2 100644
--- a/server-ce/genScript.js
+++ b/server-ce/genScript.js
@@ -4,26 +4,9 @@ console.log('#!/bin/bash')
 console.log('set -ex')
 
 switch (process.argv.pop()) {
-  case 'checkout':
-    for (const service of services) {
-      console.log(`git clone ${service.repo} ${service.name}`)
-      console.log(`git -C ${service.name} checkout ${service.version}`)
-    }
-    break
-  case 'revisions':
-    for (const service of services) {
-      console.log(`echo -n /var/www/sharelatex/${service.name},`)
-      console.log(`git -C ${service.name} rev-parse HEAD`)
-    }
-    break
-  case 'cleanup-git':
-    for (const service of services) {
-      console.log(`rm -rf ${service.name}/.git`)
-    }
-    break
   case 'install':
     for (const service of services) {
-      console.log('pushd', service.name)
+      console.log('pushd', `services/${service.name}`)
       switch (service.name) {
         case 'web':
           console.log('npm ci')
@@ -37,7 +20,7 @@ switch (process.argv.pop()) {
     break
   case 'compile':
     for (const service of services) {
-      console.log('pushd', service.name)
+      console.log('pushd', `services/${service.name}`)
       switch (service.name) {
         case 'web':
           console.log('npm run webpack:production')
diff --git a/server-ce/init_scripts/98_check_db_access.sh b/server-ce/init_scripts/98_check_db_access.sh
index aab69e24fe..507295e471 100755
--- a/server-ce/init_scripts/98_check_db_access.sh
+++ b/server-ce/init_scripts/98_check_db_access.sh
@@ -2,7 +2,7 @@
 set -e
 
 echo "Checking can connect to mongo and redis"
-cd /var/www/sharelatex/web/modules/server-ce-scripts/scripts
-node check-mongodb
-node check-redis
+cd /overleaf/services/web
+node modules/server-ce-scripts/scripts/check-mongodb
+node modules/server-ce-scripts/scripts/check-redis
 echo "All checks passed"
diff --git a/server-ce/init_scripts/99_run_web_migrations.sh b/server-ce/init_scripts/99_run_web_migrations.sh
index a94ce18602..e0546953cc 100755
--- a/server-ce/init_scripts/99_run_web_migrations.sh
+++ b/server-ce/init_scripts/99_run_web_migrations.sh
@@ -8,6 +8,6 @@ else
 fi
 
 echo "Running migrations for $environment"
-cd /var/www/sharelatex/web
+cd /overleaf/services/web
 npm run migrations -- migrate -t "$environment"
 echo "Finished migrations"
diff --git a/server-ce/nginx/sharelatex.conf b/server-ce/nginx/sharelatex.conf
index 723fb7fbe7..4da8fb25ee 100644
--- a/server-ce/nginx/sharelatex.conf
+++ b/server-ce/nginx/sharelatex.conf
@@ -2,7 +2,7 @@ server {
 	listen         80;
 	server_name    _; # Catch all, see http://nginx.org/en/docs/http/server_names.html
 
-	root /var/www/sharelatex/web/public/;
+	root /overleaf/services/web/public/;
 
 	location / {
 		proxy_pass http://127.0.0.1:3000;
diff --git a/server-ce/runit/chat-sharelatex/run b/server-ce/runit/chat-sharelatex/run
index c000f7d80d..4a33ebba44 100755
--- a/server-ce/runit/chat-sharelatex/run
+++ b/server-ce/runit/chat-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30100"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS  /var/www/sharelatex/chat/app.js >> /var/log/sharelatex/chat.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS  /overleaf/services/chat/app.js >> /var/log/sharelatex/chat.log 2>&1
diff --git a/server-ce/runit/clsi-sharelatex/run b/server-ce/runit/clsi-sharelatex/run
index 9045563ed2..5e96b4fd46 100755
--- a/server-ce/runit/clsi-sharelatex/run
+++ b/server-ce/runit/clsi-sharelatex/run
@@ -15,4 +15,4 @@ if [ -e '/var/run/docker.sock' ]; then
   usermod -aG dockeronhost www-data
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/clsi/app.js >> /var/log/sharelatex/clsi.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/clsi/app.js >> /var/log/sharelatex/clsi.log 2>&1
diff --git a/server-ce/runit/contacts-sharelatex/run b/server-ce/runit/contacts-sharelatex/run
index 8de491ac6a..3d7afee986 100755
--- a/server-ce/runit/contacts-sharelatex/run
+++ b/server-ce/runit/contacts-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30360"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/contacts/app.js >> /var/log/sharelatex/contacts.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/contacts/app.js >> /var/log/sharelatex/contacts.log 2>&1
diff --git a/server-ce/runit/docstore-sharelatex/run b/server-ce/runit/docstore-sharelatex/run
index f6b3285358..8755599b5f 100755
--- a/server-ce/runit/docstore-sharelatex/run
+++ b/server-ce/runit/docstore-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30160"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/docstore/app.js >> /var/log/sharelatex/docstore.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/docstore/app.js >> /var/log/sharelatex/docstore.log 2>&1
diff --git a/server-ce/runit/document-updater-sharelatex/run b/server-ce/runit/document-updater-sharelatex/run
index 7d688a17de..afa2818949 100755
--- a/server-ce/runit/document-updater-sharelatex/run
+++ b/server-ce/runit/document-updater-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30030"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/document-updater/app.js >> /var/log/sharelatex/document-updater.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/document-updater/app.js >> /var/log/sharelatex/document-updater.log 2>&1
diff --git a/server-ce/runit/filestore-sharelatex/run b/server-ce/runit/filestore-sharelatex/run
index 8baccbfe0b..61c75e728b 100755
--- a/server-ce/runit/filestore-sharelatex/run
+++ b/server-ce/runit/filestore-sharelatex/run
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node /overleaf/services/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1
diff --git a/server-ce/runit/notifications-sharelatex/run b/server-ce/runit/notifications-sharelatex/run
index 721b1cf1e9..a60dd25522 100755
--- a/server-ce/runit/notifications-sharelatex/run
+++ b/server-ce/runit/notifications-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30420"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/notifications/app.js >> /var/log/sharelatex/notifications.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/notifications/app.js >> /var/log/sharelatex/notifications.log 2>&1
diff --git a/server-ce/runit/real-time-sharelatex/run b/server-ce/runit/real-time-sharelatex/run
index 392c4525ef..5698492521 100755
--- a/server-ce/runit/real-time-sharelatex/run
+++ b/server-ce/runit/real-time-sharelatex/run
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node /overleaf/services/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1
diff --git a/server-ce/runit/spelling-sharelatex/run b/server-ce/runit/spelling-sharelatex/run
index af7941a4b4..d1e3ccba0a 100755
--- a/server-ce/runit/spelling-sharelatex/run
+++ b/server-ce/runit/spelling-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30050"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/spelling/app.js >> /var/log/sharelatex/spelling.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/spelling/app.js >> /var/log/sharelatex/spelling.log 2>&1
diff --git a/server-ce/runit/track-changes-sharelatex/run b/server-ce/runit/track-changes-sharelatex/run
index a137098588..968296af2c 100755
--- a/server-ce/runit/track-changes-sharelatex/run
+++ b/server-ce/runit/track-changes-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30150"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/track-changes/app.js >> /var/log/sharelatex/track-changes.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/track-changes/app.js >> /var/log/sharelatex/track-changes.log 2>&1
diff --git a/server-ce/runit/web-sharelatex/run b/server-ce/runit/web-sharelatex/run
index 00531b5f05..64ed27ccfa 100755
--- a/server-ce/runit/web-sharelatex/run
+++ b/server-ce/runit/web-sharelatex/run
@@ -6,4 +6,4 @@ if [ "$DEBUG_NODE" == "true" ]; then
     NODE_PARAMS="--inspect=0.0.0.0:30000"
 fi
 
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/web/app.js >> /var/log/sharelatex/web.log 2>&1
+exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/web/app.js >> /var/log/sharelatex/web.log 2>&1