diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md
index 13a092e9..fbc855c8 100644
--- a/site/concepts/fastdp-how-it-works.md
+++ b/site/concepts/fastdp-how-it-works.md
@@ -25,7 +25,7 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat
 
 **See Also**
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [Using Fast Datapath](/site/tasks/manage/fastdp.md)
 
 
diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md
index 3e6759a7..9420b708 100644
--- a/site/install/installing-weave.md
+++ b/site/install/installing-weave.md
@@ -19,7 +19,7 @@ documentation](https://docs.docker.com/installation/mac/#from-your-shell) or ref
 
 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).
+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/install/using-weave.md).
 
 ### Quick Start Screencast
 
@@ -64,10 +64,10 @@ To make encryption in fast datapath work on Google Cloud Platform, see
 
 **See Also** 
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [Getting Started Guides](http://www.weave.works/guides/)
  * [Features](/site/overview/features.md)
  * [Troubleshooting](/site/troubleshooting.md)
  * [Building](/site/building.md)
- * [Using Weave with Systemd](/site/installing-weave/systemd.md)
+ * [Using Weave with Systemd](/site/install/systemd.md)
  
diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md
index a090352a..aedaa989 100644
--- a/site/install/plugin/plugin.md
+++ b/site/install/plugin/plugin.md
@@ -16,7 +16,7 @@ networking plugins, does not require an external cluster store.
 To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via
 [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md).
 
-See [Using Weave Net](/site/using-weave.md#peer-connections) for a discussion on peer connections. 
+See [Using Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. 
 
 After you've launched Weave Net and peered your hosts,  you can start containers using the following, for example:
 
diff --git a/site/install/systemd.md b/site/install/systemd.md
index f6129613..357cdde9 100644
--- a/site/install/systemd.md
+++ b/site/install/systemd.md
@@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the
 
 **See Also**
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [Getting Started Guides](http://www.weave.works/guides/)
  * [Features](/site/overview/features.md)
  * [Troubleshooting](/site/troubleshooting.md)
diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md
index 9d5260a2..0a1d4ecf 100644
--- a/site/install/weave-cloud.md
+++ b/site/install/weave-cloud.md
@@ -122,7 +122,7 @@ connect to it.
 **See Also**
 
  * [Installing Weave Net](/site/install/installing-weave.md)
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md)
  * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md)
  * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md)
diff --git a/site/kubernetes.md b/site/kubernetes.md
index f06df09f..0c8b13f8 100644
--- a/site/kubernetes.md
+++ b/site/kubernetes.md
@@ -36,7 +36,7 @@ To create a network that spans multiple hosts, the Weave peers must be connected
 This is accomplished by specifying the other hosts during `weave launch` or via
 [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md).
 
-See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) 
+See [Creating Peer Connections Between Hosts](/site/install/using-weave.md#peer-connections) 
 for a discussion on peer connections. 
 
     weave launch <peer hosts>
diff --git a/site/operational-guide/autoscaling.md b/site/operational-guide/autoscaling.md
index 41ccf719..79a0db40 100644
--- a/site/operational-guide/autoscaling.md
+++ b/site/operational-guide/autoscaling.md
@@ -25,7 +25,7 @@ and partitions.
 ### Scaling Out
 
 On the additional dynamic peer, at boot, via
-[systemd](/site/installing-weave/systemd.md) or equivalent:
+[systemd](/site/install/systemd.md) or equivalent:
 
     weave launch --no-restart --ipalloc-init=observer $PEERS
 
diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md
index 703773f4..3c703b97 100644
--- a/site/operational-guide/tasks.md
+++ b/site/operational-guide/tasks.md
@@ -21,7 +21,7 @@ once and your system is configured to start Docker on boot, then Weave Net
 will start automatically on system restarts.
 
 If you are aiming for a non-interactive installation, use
-[systemd](/site/installing-weave/systemd.md) or a similar init system to
+[systemd](/site/install/systemd.md) or a similar init system to
 launch Weave using the `--no-restart` flag after Docker has been started.
 
 ## <a name="detect-reclaim-ipam"></a>Detecting and Reclaiming Lost IP Address Space
diff --git a/site/operational-guide/uniform-dynamic-cluster.md b/site/operational-guide/uniform-dynamic-cluster.md
index fe067618..c33456d7 100644
--- a/site/operational-guide/uniform-dynamic-cluster.md
+++ b/site/operational-guide/uniform-dynamic-cluster.md
@@ -18,7 +18,7 @@ A uniform dynamic cluster has the following characteristics:
 ## Bootstrapping
 
 On each initial peer N, at boot, via
-[systemd](/site/installing-weave/systemd.md):
+[systemd](/site/install/systemd.md):
 
     hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS
 
@@ -45,7 +45,7 @@ Where
 ## Adding a Peer
 
 On each new peer, at boot, via
-[systemd](/site/installing-weave/systemd.md):
+[systemd](/site/install/systemd.md):
 
     hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS
 
diff --git a/site/operational-guide/uniform-fixed-cluster.md b/site/operational-guide/uniform-fixed-cluster.md
index 0913fbc7..fa9c56d4 100644
--- a/site/operational-guide/uniform-fixed-cluster.md
+++ b/site/operational-guide/uniform-fixed-cluster.md
@@ -24,7 +24,7 @@ A uniform fixed cluster has the following characteristics:
 ### Bootstrapping
 
 On each initial peer, at boot, via
-[systemd](/site/installing-weave/systemd.md):
+[systemd](/site/install/systemd.md):
 
     weave launch --no-restart $PEERS
 
@@ -56,7 +56,7 @@ that](/site/troubleshooting.md) before moving on.
 ### Adding a Peer
 
 On the new peer, at boot, via
-[systemd](/site/installing-weave/systemd.md) run:
+[systemd](/site/install/systemd.md) run:
 
     weave launch --no-restart $PEERS
 
diff --git a/site/overview/features.md b/site/overview/features.md
index 3ce1418f..259cad3b 100644
--- a/site/overview/features.md
+++ b/site/overview/features.md
@@ -26,7 +26,7 @@ search_type: Documentation
  * [Container Mobility](#container-mobility)
  * [Fault Tolerance](#fault-tolerance) 
 
-For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/using-weave.md).
+For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/install/using-weave.md).
 
 ### <a name="virtual-ethernet-switch"></a>Virtual Ethernet Switch
 
@@ -45,7 +45,7 @@ Broadcast and Multicast protocols can also be used
 over Weave Net.
 
 To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) 
-and [Using Weave Net](/site/using-weave.md).
+and [Using Weave Net](/site/install/using-weave.md).
 
 ### <a name="fast-data-path"></a>Fast Datapath
 
diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md
index d479c340..956dc0d6 100644
--- a/site/tasks/manage/application-isolation.md
+++ b/site/tasks/manage/application-isolation.md
@@ -14,7 +14,7 @@ techniques can still be used to deploy applications to a container network.
 To begin isolating an application (or parts of an application),  
 configure Weave Net's IP allocator to manage multiple subnets. 
 
-Using [the netcat example](/site/using-weave.md), configure multiple subsets:
+Using [the netcat example](/site/install/using-weave.md), configure multiple subsets:
 
     host1$ weave launch --ipalloc-range 10.2.0.0/16 --ipalloc-default-subnet 10.2.1.0/24
     host1$ eval $(weave env)
diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md
index a755034d..7857631c 100644
--- a/site/tasks/manage/awsvpc.md
+++ b/site/tasks/manage/awsvpc.md
@@ -101,5 +101,5 @@ In AWS-VPC mode you can run the following:
 
 **See Also**
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
 
diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md
index 02b17fc3..64a6f034 100644
--- a/site/tasks/manage/fastdp.md
+++ b/site/tasks/manage/fastdp.md
@@ -71,6 +71,6 @@ frame" configuration:
 
 **See Also**
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md)
  * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/)
diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md
index ea9afbeb..b4f96b57 100644
--- a/site/tasks/manage/host-network-integration.md
+++ b/site/tasks/manage/host-network-integration.md
@@ -6,7 +6,7 @@ search_type: Documentation
 
 Weave application networks can be integrated with an external host network, establishing connectivity between the host and with application containers running anywhere.
 
-For example, returning to the [netcat example](/site/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. 
+For example, returning to the [netcat example](/site/install/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. 
 
 On `$HOST2` run:
 
@@ -59,6 +59,6 @@ hosts.
 
 **See Also**
 
- * [Using Weave Net](/site/using-weave.md)
+ * [Using Weave Net](/site/install/using-weave.md)
  * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md)
  * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md)
diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md
index a3b2ecd0..4114bbbb 100644
--- a/site/tasks/manage/service-management.md
+++ b/site/tasks/manage/service-management.md
@@ -21,7 +21,7 @@ accessible to the outside world (and, more generally, to other networks)
 from any Weave Net host, irrespective of where the service containers are
 located.
 
-Returning to the [netcat example service](/site/using-weave.md), 
+Returning to the [netcat example service](/site/install/using-weave.md), 
 you can expose the netcat service running on `HOST1` and make it accessible to the outside world via `$HOST2`. 
 
 First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md):
@@ -49,7 +49,7 @@ Similar NAT rules to the above can be used to expose services not just to the ou
 Applications running in containers on a Weave network can be given access to services, which are only reachable from certain 
 Weave hosts, regardless of where the actual application containers are located.
 
-Expanding on the [netcat service example](/site/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. 
+Expanding on the [netcat service example](/site/install/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. 
 
 An additional caveat is that `$HOST3` can only be reached from `$HOST1`, which is not accessible via `$HOST2`. Nonetheless, you still need to make the `$HOST3` service available to an application that is running in a container on `$HOST2`.
 
@@ -88,7 +88,7 @@ You can combine the service export and service import features to establish conn
 
 Each network imports its services into Weave Net, while at the same time, exports from Weave Net any services that are required by its applications. In this scenario, there are no application containers (although, there could be). Weave Net is acting as an address translation and routing facility, and uses the Weave container network as an intermediary.
 
-Expanding on the [netcat example](/site/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. 
+Expanding on the [netcat example](/site/install/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. 
 
 Begin importing the service onto `$HOST2` by first exposing the application network: