diff --git a/docs/README.md b/docs/README.md
index e2fe36fda..83049d818 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -21,7 +21,7 @@ If you are a developer using IronFunctions through the API, this section is for
 
 If you are operating IronFunctions, this section is for you.
 
-* [Running in Production](operating/production.md)
+* [Running in Production Overview](operating/production.md)
 * [Databases](databases/README.md)
 * [Message Queues](mqs/README.md)
 * [Logging](operating/logging.md)
@@ -30,4 +30,8 @@ If you are operating IronFunctions, this section is for you.
 * [Extending IronFunctions](operating/extending.md)
 * [Docker Configuration](operating/docker.md)
 * [Operating On Windows](operating/windows.md)
+* Running IronFunctions on:
+  * [Kubernetes](operating/kubernetes/README.md)
+  * [Docker Swarm](operating/docker-swarm/README.md)
+
 
diff --git a/docs/databases/README.md b/docs/operating/databases/README.md
similarity index 100%
rename from docs/databases/README.md
rename to docs/operating/databases/README.md
diff --git a/docs/databases/boltdb.md b/docs/operating/databases/boltdb.md
similarity index 100%
rename from docs/databases/boltdb.md
rename to docs/operating/databases/boltdb.md
diff --git a/docs/databases/postgres.md b/docs/operating/databases/postgres.md
similarity index 100%
rename from docs/databases/postgres.md
rename to docs/operating/databases/postgres.md
diff --git a/docs/docker-swarm/swarm.md b/docs/operating/docker-swarm/README.md
similarity index 100%
rename from docs/docker-swarm/swarm.md
rename to docs/operating/docker-swarm/README.md
diff --git a/docs/kubernetes/kubernetes.md b/docs/operating/kubernetes/README.md
similarity index 100%
rename from docs/kubernetes/kubernetes.md
rename to docs/operating/kubernetes/README.md
diff --git a/docs/kubernetes/kubernetes-production/functions-config.yaml b/docs/operating/kubernetes/kubernetes-production/functions-config.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/functions-config.yaml
rename to docs/operating/kubernetes/kubernetes-production/functions-config.yaml
diff --git a/docs/kubernetes/kubernetes-production/functions-deployment.yaml b/docs/operating/kubernetes/kubernetes-production/functions-deployment.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/functions-deployment.yaml
rename to docs/operating/kubernetes/kubernetes-production/functions-deployment.yaml
diff --git a/docs/kubernetes/kubernetes-production/functions-service.yaml b/docs/operating/kubernetes/kubernetes-production/functions-service.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/functions-service.yaml
rename to docs/operating/kubernetes/kubernetes-production/functions-service.yaml
diff --git a/docs/kubernetes/kubernetes-production/postgresql-deployment.yaml b/docs/operating/kubernetes/kubernetes-production/postgresql-deployment.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/postgresql-deployment.yaml
rename to docs/operating/kubernetes/kubernetes-production/postgresql-deployment.yaml
diff --git a/docs/kubernetes/kubernetes-production/postgresql-service.yaml b/docs/operating/kubernetes/kubernetes-production/postgresql-service.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/postgresql-service.yaml
rename to docs/operating/kubernetes/kubernetes-production/postgresql-service.yaml
diff --git a/docs/kubernetes/kubernetes-production/redis-deployment.yaml b/docs/operating/kubernetes/kubernetes-production/redis-deployment.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/redis-deployment.yaml
rename to docs/operating/kubernetes/kubernetes-production/redis-deployment.yaml
diff --git a/docs/kubernetes/kubernetes-production/redis-service.yaml b/docs/operating/kubernetes/kubernetes-production/redis-service.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-production/redis-service.yaml
rename to docs/operating/kubernetes/kubernetes-production/redis-service.yaml
diff --git a/docs/kubernetes/kubernetes-quick/deployment.yaml b/docs/operating/kubernetes/kubernetes-quick/deployment.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-quick/deployment.yaml
rename to docs/operating/kubernetes/kubernetes-quick/deployment.yaml
diff --git a/docs/kubernetes/kubernetes-quick/service.yaml b/docs/operating/kubernetes/kubernetes-quick/service.yaml
similarity index 100%
rename from docs/kubernetes/kubernetes-quick/service.yaml
rename to docs/operating/kubernetes/kubernetes-quick/service.yaml