diff --git a/build.ps1 b/build.ps1
index 1eadba11d..18359f154 100644
--- a/build.ps1
+++ b/build.ps1
@@ -4,9 +4,9 @@ echo $dir
 echo "`nBuilding bitwarden"
 echo "=================="
 
-& $dir\util\Server\build.ps1
 & $dir\src\Api\build.ps1
 & $dir\src\Identity\build.ps1
-& $dir\nginx\build.ps1
-& $dir\attachments\build.ps1
+& $dir\util\Server\build.ps1
+& $dir\util\Nginx\build.ps1
+& $dir\util\Attachments\build.ps1
 & $dir\util\Setup\build.ps1
diff --git a/build.sh b/build.sh
index 139bab8e4..ee0649ccb 100644
--- a/build.sh
+++ b/build.sh
@@ -6,9 +6,9 @@ DIR="$(dirname $(readlink -f $0))"
 echo -e "\nBuilding bitwarden"
 echo -e "=================="
 
-$DIR/util/Server/build.sh
 $DIR/src/Api/build.sh
 $DIR/src/Identity/build.sh
-$DIR/nginx/build.sh
-$DIR/attachments/build.sh
+$DIR/util/Server/build.sh
+$DIR/util/Nginx/build.sh
+$DIR/util/Attachments/build.sh
 $DIR/util/Setup/build.sh
diff --git a/attachments/.dockerignore b/util/Attachments/.dockerignore
similarity index 100%
rename from attachments/.dockerignore
rename to util/Attachments/.dockerignore
diff --git a/attachments/Dockerfile b/util/Attachments/Dockerfile
similarity index 100%
rename from attachments/Dockerfile
rename to util/Attachments/Dockerfile
diff --git a/attachments/build.ps1 b/util/Attachments/build.ps1
similarity index 100%
rename from attachments/build.ps1
rename to util/Attachments/build.ps1
diff --git a/attachments/build.sh b/util/Attachments/build.sh
similarity index 100%
rename from attachments/build.sh
rename to util/Attachments/build.sh
diff --git a/attachments/entrypoint.sh b/util/Attachments/entrypoint.sh
similarity index 100%
rename from attachments/entrypoint.sh
rename to util/Attachments/entrypoint.sh
diff --git a/nginx/.dockerignore b/util/Nginx/.dockerignore
similarity index 100%
rename from nginx/.dockerignore
rename to util/Nginx/.dockerignore
diff --git a/nginx/Dockerfile b/util/Nginx/Dockerfile
similarity index 100%
rename from nginx/Dockerfile
rename to util/Nginx/Dockerfile
diff --git a/nginx/build.ps1 b/util/Nginx/build.ps1
similarity index 100%
rename from nginx/build.ps1
rename to util/Nginx/build.ps1
diff --git a/nginx/build.sh b/util/Nginx/build.sh
similarity index 100%
rename from nginx/build.sh
rename to util/Nginx/build.sh
diff --git a/nginx/entrypoint.sh b/util/Nginx/entrypoint.sh
similarity index 100%
rename from nginx/entrypoint.sh
rename to util/Nginx/entrypoint.sh
diff --git a/nginx/nginx.conf b/util/Nginx/nginx.conf
similarity index 100%
rename from nginx/nginx.conf
rename to util/Nginx/nginx.conf