diff --git a/site/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md
similarity index 100%
rename from site/ipam/allocation-multi-ipam.md
rename to site/tasks/ipam/allocation-multi-ipam.md
diff --git a/site/tasks/configuring-weave.md b/site/tasks/ipam/configuring-weave.md
similarity index 100%
rename from site/tasks/configuring-weave.md
rename to site/tasks/ipam/configuring-weave.md
diff --git a/site/ipam.md b/site/tasks/ipam/ipam.md
similarity index 100%
rename from site/ipam.md
rename to site/tasks/ipam/ipam.md
diff --git a/site/tasks/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md
similarity index 100%
rename from site/tasks/manual-ip-address.md
rename to site/tasks/ipam/manual-ip-address.md
diff --git a/site/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md
similarity index 100%
rename from site/ipam/stop-remove-peers-ipam.md
rename to site/tasks/ipam/stop-remove-peers-ipam.md
diff --git a/site/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md
similarity index 100%
rename from site/ipam/troubleshooting-ipam.md
rename to site/tasks/ipam/troubleshooting-ipam.md
diff --git a/site/tasks/weave-net-awsvpc-1007x438.png b/site/tasks/manage/weave-net-awsvpc-1007x438.png
similarity index 100%
rename from site/tasks/weave-net-awsvpc-1007x438.png
rename to site/tasks/manage/weave-net-awsvpc-1007x438.png
diff --git a/site/weavedns/how-works-weavedns.md b/site/tasks/weavedns/how-works-weavedns.md
similarity index 100%
rename from site/weavedns/how-works-weavedns.md
rename to site/tasks/weavedns/how-works-weavedns.md
diff --git a/site/weavedns/load-balance-fault-weavedns.md b/site/tasks/weavedns/load-balance-fault-weavedns.md
similarity index 100%
rename from site/weavedns/load-balance-fault-weavedns.md
rename to site/tasks/weavedns/load-balance-fault-weavedns.md
diff --git a/site/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md
similarity index 100%
rename from site/weavedns/managing-domains-weavedns.md
rename to site/tasks/weavedns/managing-domains-weavedns.md
diff --git a/site/weavedns/managing-entries-weavedns.md b/site/tasks/weavedns/managing-entries-weavedns.md
similarity index 100%
rename from site/weavedns/managing-entries-weavedns.md
rename to site/tasks/weavedns/managing-entries-weavedns.md
diff --git a/site/weavedns/troubleshooting-weavedns.md b/site/tasks/weavedns/troubleshooting-weavedns.md
similarity index 100%
rename from site/weavedns/troubleshooting-weavedns.md
rename to site/tasks/weavedns/troubleshooting-weavedns.md