diff --git a/site/faq.md b/site/faq.md
index 1e0cd0fd..7afc207c 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -117,5 +117,5 @@ Ubuntu image with those two commands added.
 
  * [Troubleshooting Weave](/site/troubleshooting.md)
  * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md)
- * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)
+ * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md)
  
diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md
index 172882ec..3e6759a7 100644
--- a/site/install/installing-weave.md
+++ b/site/install/installing-weave.md
@@ -17,7 +17,7 @@ If you are on OSX and you are using Docker Machine ensure that a VM is running a
 before downloading Weave Net. To set up a VM see [the Docker Machine
 documentation](https://docs.docker.com/installation/mac/#from-your-shell) or refer to ["Part 1: Launching Weave Net with Docker Machine"](/guides/part-1-launching-weave-net-with-docker-machine/).
 
-After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md).
+After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md).
 
 With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/using-weave.md).
 
diff --git a/site/overview/features.md b/site/overview/features.md
index 02dba740..3ce1418f 100644
--- a/site/overview/features.md
+++ b/site/overview/features.md
@@ -58,7 +58,7 @@ See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and
 
 ### <a name="docker"></a>Seamless Docker Integration (Weave Docker API Proxy)
 
-Weave Net includes a [Docker API Proxy](/site/weave-docker-api.md), which can be 
+Weave Net includes a [Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md), which can be 
 used to start containers using the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/), and attach them to the Weave network before they begin execution.
 
 To use the proxy, run:
@@ -71,7 +71,7 @@ Containers started in this way that subsequently restart, either
 by an explicit `docker restart` command or by Docker restart 
 policy, are re-attached to the Weave network by the `Weave Docker API Proxy`.
 
-See [Integrating Docker via the API Proxy](/site/weave-docker-api.md).
+See [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md).
 
 
 ### <a name="plugin"></a>Weave Network Docker Plugin
diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md
index 5887b620..d64c18c4 100644
--- a/site/tasks/manage/dynamically-attach-containers.md
+++ b/site/tasks/manage/dynamically-attach-containers.md
@@ -32,7 +32,7 @@ with the `--without-dns` argument).
     10.32.0.1
 
 If you would like `/etc/hosts` to contain the Weave Net address (the
-same way [the proxy does](/site/weave-docker-api/name-resolution-proxy.md)),
+same way [the proxy does](/site/tasks/weave-docker-api/name-resolution-proxy.md)),
 specify `--rewrite-hosts` when running `weave attach`:
 
     host1$ weave attach --rewrite-hosts c1
diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md
index c0b94603..127cc622 100644
--- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md
+++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md
@@ -56,5 +56,5 @@ to the proxy, the specified label takes precedence over the container's name.
 
 **See Also**
 
- * [Name resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md)
+ * [Name resolution via `/etc/hosts`](/site/tasks/weave-docker-api/name-resolution-proxy.md)
  * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md)
diff --git a/site/tasks/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md
index c0d42267..3a2e0a74 100644
--- a/site/tasks/weave-docker-api/name-resolution-proxy.md
+++ b/site/tasks/weave-docker-api/name-resolution-proxy.md
@@ -31,5 +31,5 @@ Docker-managed networks), the proxy must be launched using the
 
 **See Also**
 
- * [Using Automatic Discovery With the Weave Proxy](/site/weave-docker-api/automatic-discovery-proxy.md)
+ * [Using Automatic Discovery With the Weave Proxy](/site/tasks/weave-docker-api/automatic-discovery-proxy.md)
 
diff --git a/site/tasks/weave-docker-api/securing-proxy.md b/site/tasks/weave-docker-api/securing-proxy.md
index feb9f26f..4431a691 100644
--- a/site/tasks/weave-docker-api/securing-proxy.md
+++ b/site/tasks/weave-docker-api/securing-proxy.md
@@ -56,4 +56,4 @@ proxy port.
 
 **See Also**
 
- * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
+ * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md)
diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md
index c6074483..00f49596 100644
--- a/site/tasks/weave-docker-api/using-proxy.md
+++ b/site/tasks/weave-docker-api/using-proxy.md
@@ -70,5 +70,5 @@ If for some reason you need to disable the proxy, but still want to start other
 
 **See Also**
 
- * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
- * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md)
+ * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md)
+ * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md)
diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md
index 1c825b45..c44613b6 100644
--- a/site/tasks/weave-docker-api/weave-docker-api.md
+++ b/site/tasks/weave-docker-api/weave-docker-api.md
@@ -89,8 +89,8 @@ to the original settings prior to running `stop`.
 
 **See Also**
 
- * [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md)
- * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md)
- * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md)
+ * [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md)
+ * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md)
+ * [Launching Containers With Weave Run (without the Proxy)](/site/tasks/weave-docker-api/launching-without-proxy.md)
 
 
diff --git a/site/tasks/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md
index cc640db5..083c9cbc 100644
--- a/site/tasks/weavedns/managing-domains-weavedns.md
+++ b/site/tasks/weavedns/managing-domains-weavedns.md
@@ -12,7 +12,7 @@ The following topics are discussed:
 ## <a name="domain-search-path"></a>Configuring the domain search paths
 
 If you don't supply a domain search path (with `--dns-search=`), Weave
-Net (via the [proxy](/site/weave-docker-api.md) or via `weave attach`)
+Net (via the [proxy](/site/tasks/weave-docker-api/weave-docker-api.md) or via `weave attach`)
 tells a container to look for "bare" hostnames, like `pingme`, in its
 own domain (or in `weave.local` if it has no domain).
 
diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md
index 8231b97b..c66da58f 100644
--- a/site/tasks/weavedns/weavedns.md
+++ b/site/tasks/weavedns/weavedns.md
@@ -45,5 +45,5 @@ disable weaveDNS itself, launch weave with the `--no-dns` option.
 
 **See Also**
 
- * [Integrating Docker via the API Proxy](/site/weave-docker-api.md)
+ * [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md)
  * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md)
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 80846668..03661925 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -286,7 +286,7 @@ on reboot. This can be disabled via:
 
 Note that the Weave Net router will create the `weave` network bridge
 if necessary when it restarts, and the [Weave Net Docker API
-Proxy](/site/weave-docker-api.md) will re-attach any application
+Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) will re-attach any application
 containers that it originally attached to the Weave network when they
 restart.
 
@@ -308,4 +308,4 @@ and the container image versions as git hashes.
 **See Also**
 
  * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md)
- * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)
+ * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md)