diff --git a/_data/tasks.yml b/_data/tasks.yml
index 7e08f62098..eda62aacea 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -47,6 +47,9 @@ toc:
   - docs/tasks/run-application/run-single-instance-stateful-application.md
   - docs/tasks/run-application/run-replicated-stateful-application.md
   - docs/tasks/run-application/upgrade-pet-set-to-stateful-set.md
+  - docs/tasks/run-application/scale-stateful-set.md
+  - docs/tasks/run-application/delete-stateful-set.md
+  - docs/tasks/run-application/force-delete-stateful-set-pod.md
   - docs/tasks/run-application/rolling-update-replication-controller.md
   - docs/tasks/run-application/horizontal-pod-autoscale.md
   - docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
@@ -80,6 +83,7 @@ toc:
   - docs/tasks/debug-application-cluster/debug-service.md
   - docs/tasks/debug-application-cluster/debug-cluster.md
   - docs/tasks/debug-application-cluster/debug-application.md
+  - docs/tasks/debug-application-cluster/debug-stateful-set.md
   - docs/tasks/debug-application-cluster/debug-application-introspection.md
   - title: Using Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
@@ -121,13 +125,6 @@ toc:
   - docs/tasks/administer-federation/replicaset.md
   - docs/tasks/administer-federation/secret.md
 
-- title: Managing Stateful Applications
-  section:
-  - docs/tasks/manage-stateful-set/scale-stateful-set.md
-  - docs/tasks/manage-stateful-set/deleting-a-statefulset.md
-  - docs/tasks/manage-stateful-set/debugging-a-statefulset.md
-  - docs/tasks/manage-stateful-set/delete-pods.md
-
 - title: Managing Cluster Daemons
   section:
   - docs/tasks/manage-daemon/update-daemon-set.md
diff --git a/docs/tasks/manage-stateful-set/debugging-a-statefulset.md b/docs/tasks/debug-application-cluster/debug-stateful-set.md
similarity index 95%
rename from docs/tasks/manage-stateful-set/debugging-a-statefulset.md
rename to docs/tasks/debug-application-cluster/debug-stateful-set.md
index f66a8a1c53..032491db88 100644
--- a/docs/tasks/manage-stateful-set/debugging-a-statefulset.md
+++ b/docs/tasks/debug-application-cluster/debug-stateful-set.md
@@ -8,6 +8,9 @@ assignees:
 - kow3ns
 - smarterclayton
 title: Debugging a StatefulSet
+redirect_from:
+- "/docs/tasks/manage-stateful-set/debugging-a-statefulset/"
+- "/docs/tasks/manage-stateful-set/debugging-a-statefulset.html"
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/deleting-a-statefulset.md b/docs/tasks/run-application/delete-stateful-set.md
similarity index 95%
rename from docs/tasks/manage-stateful-set/deleting-a-statefulset.md
rename to docs/tasks/run-application/delete-stateful-set.md
index 76cc87dcf0..06aa9c0685 100644
--- a/docs/tasks/manage-stateful-set/deleting-a-statefulset.md
+++ b/docs/tasks/run-application/delete-stateful-set.md
@@ -6,6 +6,9 @@ assignees:
 - janetkuo
 - smarterclayton
 title: Deleting a Stateful Set
+redirect_from:
+- "/docs/tasks/manage-stateful-set/deleting-a-statefulset/"
+- "/docs/tasks/manage-stateful-set/deleting-a-statefulset.html"
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/delete-pods.md b/docs/tasks/run-application/force-delete-stateful-set-pod.md
similarity index 97%
rename from docs/tasks/manage-stateful-set/delete-pods.md
rename to docs/tasks/run-application/force-delete-stateful-set-pod.md
index d1b66ce881..9f585253ae 100644
--- a/docs/tasks/manage-stateful-set/delete-pods.md
+++ b/docs/tasks/run-application/force-delete-stateful-set-pod.md
@@ -5,6 +5,9 @@ assignees:
 - foxish
 - smarterclayton
 title: Force Deleting StatefulSet Pods
+redirect:from:
+- "/docs/tasks/manage-stateful-set/delete-pods/"
+- "/docs/tasks/manage-stateful-set/delete-pods.html"
 ---
 
 {% capture overview %}
diff --git a/docs/tasks/manage-stateful-set/scale-stateful-set.md b/docs/tasks/run-application/scale-stateful-set.md
similarity index 96%
rename from docs/tasks/manage-stateful-set/scale-stateful-set.md
rename to docs/tasks/run-application/scale-stateful-set.md
index b79f188e6f..9386393fbb 100644
--- a/docs/tasks/manage-stateful-set/scale-stateful-set.md
+++ b/docs/tasks/run-application/scale-stateful-set.md
@@ -8,6 +8,9 @@ assignees:
 - kow3ns
 - smarterclayton
 title: Scaling a StatefulSet
+redirect_from:
+- "/docs/tasks/manage-stateful-set/scale-stateful-set/"
+- "/docs/tasks/manage-stateful-set/scale-stateful-set.html"
 ---
 
 {% capture overview %}