diff --git a/site/using-weave/configuring-weave.md b/site/tasks/configuring-weave.md
similarity index 100%
rename from site/using-weave/configuring-weave.md
rename to site/tasks/configuring-weave.md
diff --git a/site/using-weave/application-isolation.md b/site/tasks/manage/application-isolation.md
similarity index 100%
rename from site/using-weave/application-isolation.md
rename to site/tasks/manage/application-isolation.md
diff --git a/site/using-weave/awsvpc.md b/site/tasks/manage/awsvpc.md
similarity index 100%
rename from site/using-weave/awsvpc.md
rename to site/tasks/manage/awsvpc.md
diff --git a/site/using-weave/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md
similarity index 100%
rename from site/using-weave/dynamically-attach-containers.md
rename to site/tasks/manage/dynamically-attach-containers.md
diff --git a/site/using-weave/fastdp.md b/site/tasks/manage/fastdp.md
similarity index 100%
rename from site/using-weave/fastdp.md
rename to site/tasks/manage/fastdp.md
diff --git a/site/using-weave/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md
similarity index 100%
rename from site/using-weave/finding-adding-hosts-dynamically.md
rename to site/tasks/manage/finding-adding-hosts-dynamically.md
diff --git a/site/using-weave/host-network-integration.md b/site/tasks/manage/host-network-integration.md
similarity index 100%
rename from site/using-weave/host-network-integration.md
rename to site/tasks/manage/host-network-integration.md
diff --git a/site/metrics.md b/site/tasks/manage/metrics.md
similarity index 100%
rename from site/metrics.md
rename to site/tasks/manage/metrics.md
diff --git a/site/using-weave/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md
similarity index 100%
rename from site/using-weave/multi-cloud-multi-hop.md
rename to site/tasks/manage/multi-cloud-multi-hop.md
diff --git a/site/using-weave/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md
similarity index 100%
rename from site/using-weave/security-untrusted-networks.md
rename to site/tasks/manage/security-untrusted-networks.md
diff --git a/site/using-weave/service-management.md b/site/tasks/manage/service-management.md
similarity index 100%
rename from site/using-weave/service-management.md
rename to site/tasks/manage/service-management.md
diff --git a/site/using-weave/manual-ip-address.md b/site/tasks/manual-ip-address.md
similarity index 100%
rename from site/using-weave/manual-ip-address.md
rename to site/tasks/manual-ip-address.md
diff --git a/site/using-weave/weave-net-awsvpc-1007x438.png b/site/tasks/weave-net-awsvpc-1007x438.png
similarity index 100%
rename from site/using-weave/weave-net-awsvpc-1007x438.png
rename to site/tasks/weave-net-awsvpc-1007x438.png