diff --git a/conf/init/service/nginx/run b/conf/init/service/nginx/run
index aa5940682..0095f76d7 100755
--- a/conf/init/service/nginx/run
+++ b/conf/init/service/nginx/run
@@ -5,10 +5,10 @@ echo 'Starting nginx'
 if [ -f /conf/stack/ssl.key ]
 then
   echo "Using HTTPS"
-  /usr/sbin/nginx -c /conf/nginx.conf
+  /usr/sbin/nginx -c /conf/nginx/nginx.conf
 else
   echo "No SSL key provided, using HTTP"
-  /usr/sbin/nginx -c /conf/nginx-nossl.conf
+  /usr/sbin/nginx -c /conf/nginx/nginx-nossl.conf
 fi
 
 echo 'Nginx exited'
diff --git a/conf/dhparams.pem b/conf/nginx/dhparams.pem
similarity index 100%
rename from conf/dhparams.pem
rename to conf/nginx/dhparams.pem
diff --git a/conf/hosted-http-base.conf b/conf/nginx/hosted-http-base.conf
similarity index 100%
rename from conf/hosted-http-base.conf
rename to conf/nginx/hosted-http-base.conf
diff --git a/conf/http-base.conf b/conf/nginx/http-base.conf
similarity index 100%
rename from conf/http-base.conf
rename to conf/nginx/http-base.conf
diff --git a/conf/nginx-nossl.conf b/conf/nginx/nginx-nossl.conf
similarity index 100%
rename from conf/nginx-nossl.conf
rename to conf/nginx/nginx-nossl.conf
diff --git a/conf/nginx.conf b/conf/nginx/nginx.conf
similarity index 100%
rename from conf/nginx.conf
rename to conf/nginx/nginx.conf
diff --git a/conf/rate-limiting.conf b/conf/nginx/rate-limiting.conf
similarity index 100%
rename from conf/rate-limiting.conf
rename to conf/nginx/rate-limiting.conf
diff --git a/conf/root-base.conf b/conf/nginx/root-base.conf
similarity index 100%
rename from conf/root-base.conf
rename to conf/nginx/root-base.conf
diff --git a/conf/server-base.conf b/conf/nginx/server-base.conf
similarity index 100%
rename from conf/server-base.conf
rename to conf/nginx/server-base.conf