diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt
index 522b110..56b204a 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionMonitoring.kt
@@ -1,9 +1,9 @@
 package org.domaindrivenarchitecture.provs.extensions.server_compounds.monitoring
 
 import org.domaindrivenarchitecture.provs.core.Prov
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxHttpConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxHttpConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.configurePrometheusDocker
 import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.runPrometheusDocker
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt
index 208393f..1f34c0f 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_compounds/monitoring/ProvisionNginxAndMonitoring.kt
@@ -1,11 +1,11 @@
 package org.domaindrivenarchitecture.provs.extensions.server_compounds.monitoring
 
 import org.domaindrivenarchitecture.provs.core.Prov
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxAddLocation
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxCreateSelfSignedCertificate
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxHttpsConfWithLocationFiles
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxAddLocation
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxCreateSelfSignedCertificate
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxHttpsConfWithLocationFiles
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.prometheusNginxConfig
 import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.provisionPrometheusDocker
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt
index 63c3fa4..2f96613 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt
@@ -8,9 +8,9 @@ import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
 import org.domaindrivenarchitecture.provs.ubuntu.user.base.createUser
 import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot.provisionCertbot
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.nginxReverseProxyHttpConfig
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxReverseProxyHttpConfig
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 
 
 /**
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginx.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt
similarity index 91%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginx.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt
index 51714ad..fb5e08e 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginx.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
@@ -6,8 +6,8 @@ import org.domaindrivenarchitecture.provs.core.remote
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.NginxConf
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.createNginxLocationFolders
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.createNginxLocationFolders
 import kotlin.system.exitProcess
 
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/BasicAuth.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt
similarity index 93%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/BasicAuth.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt
index d9d48d2..d2dab99 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/BasicAuth.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.Secret
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Configs.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt
similarity index 99%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Configs.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt
index 40be12d..e5bc0b2 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Configs.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
 
 class NginxConf(val conf: String = NGINX_MINIMAL_CONF) {
     companion object {}
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Locations.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt
similarity index 97%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Locations.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt
index cf14cc7..dc391d5 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/Locations.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt
@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.core.ProvResult
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/SelfSignedCertificate.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt
similarity index 94%
rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/SelfSignedCertificate.kt
rename to src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt
index 196aad7..b4034f9 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/SelfSignedCertificate.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt
@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.core.Prov
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 
 
 internal val certificateName = "selfsigned"
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginxKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt
similarity index 97%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginxKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt
index a020a35..1caed6e 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/ProvisionNginxKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt
@@ -1,10 +1,10 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.replaceTextInFile
 import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base.*
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.*
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/LocationsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt
similarity index 91%
rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/LocationsKtTest.kt
rename to src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt
index e1e1a24..73d9b11 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/nginx/base/LocationsKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt
@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.extensions.server_software.nginx.base
+package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base
 
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile
 import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.configFile
-import org.domaindrivenarchitecture.provs.extensions.server_software.nginx.provisionNginxStandAlone
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.configFile
+import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test