diff --git a/_data/toc.yaml b/_data/toc.yaml
index 04bf321491..cbc2773987 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -278,35 +278,33 @@ guides:
       title: IPv6 with Docker
 - sectiontitle: Manage application data
   section:
-    - path: /engine/admin/volumes/
+    - path: /storage/
       title: Storage overview
-    - path: /engine/admin/volumes/volumes/
+    - path: /storage/volumes/
       title: Volumes
-    - path: /engine/admin/volumes/bind-mounts/
+    - path: /storage/bind-mounts/
       title: Bind mounts
-    - path: /engine/admin/volumes/tmpfs/
+    - path: /storage/tmpfs/
       title: tmpfs mounts
-    - path: /engine/admin/troubleshooting_volume_errors/
+    - path: /storage/troubleshooting_volume_errors/
       title: Troubleshoot volume problems
     - sectiontitle: Store data within containers
       section:
-      - path: /engine/userguide/storagedriver/
-        title: Storage driver overview
-      - path: /engine/userguide/storagedriver/imagesandcontainers/
-        title: About images, containers, and storage drivers
-      - path: /engine/userguide/storagedriver/selectadriver/
+      - path: /storage/storagedriver/
+        title: About storage drivers
+      - path: /storage/storagedriver/select-storage-driver/
         title: Select a storage driver
-      - path: /engine/userguide/storagedriver/aufs-driver/
+      - path: /storage/storagedriver/aufs-driver/
         title: Use the AUFS storage driver
-      - path: /engine/userguide/storagedriver/btrfs-driver/
+      - path: /storage/storagedriver/btrfs-driver/
         title: Use the Btrfs storage driver
-      - path: /engine/userguide/storagedriver/device-mapper-driver/
+      - path: /storage/storagedriver/device-mapper-driver/
         title: Use the Device mapper storage driver
-      - path: /engine/userguide/storagedriver/overlayfs-driver/
+      - path: /storage/storagedriver/overlayfs-driver/
         title: Use the OverlayFS storage driver
-      - path: /engine/userguide/storagedriver/zfs-driver/
+      - path: /storage/storagedriver/zfs-driver/
         title: Use the ZFS storage driver
-      - path: /engine/userguide/storagedriver/vfs-driver/
+      - path: /storage/storagedriver/vfs-driver/
         title: Use the VFS storage driver
 - sectiontitle: Run your app in production
   section:
diff --git a/engine/userguide/storagedriver/index.md b/engine/userguide/storagedriver/index.md
deleted file mode 100644
index 2dd6bb1a7c..0000000000
--- a/engine/userguide/storagedriver/index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-description: Learn how to select the proper storage driver for your container.
-keywords: container, storage, driver, aufs, btrfs, devicemapper, zfs, overlay, overlay2
-title: Docker storage drivers
----
-
-Ideally, very little data is written to a container's writable layer, and you
-use Docker volumes to write data. However, some workloads require you to be able
-to write to the container's writable layer. This is where storage drivers come
-in.
-
-Docker uses a series of different storage drivers to manage the filesystems
-within images and running containers. These storage drivers are different from
-[Docker volumes](/engine/tutorials/dockervolumes.md), which manage storage
-which can be shared among multiple containers.
-
-Docker relies on driver technology to manage the storage and interactions
-associated with images and the containers that run them. This section contains
-the following pages:
-
-* [About images, containers, and storage drivers](imagesandcontainers.md)
-* [Select a storage driver](selectadriver.md)
-* [AUFS storage driver in practice](aufs-driver.md)
-* [Btrfs storage driver in practice](btrfs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
-* [OverlayFS in practice](overlayfs-driver.md)
-* [ZFS storage in practice](zfs-driver.md)
-
-If you are new to Docker containers make sure you read
-[about images, containers, and storage drivers](imagesandcontainers.md) first.
-It explains key concepts and technologies that can help you when working with
-storage drivers.
-
-### Acknowledgment
-
-The Docker storage driver material was created in large part by our guest author
-Nigel Poulton with a bit of help from Docker's own Jérôme Petazzoni. In his
-spare time Nigel creates
-[IT training videos](http://www.pluralsight.com/author/nigel-poulton) and co-hosts
-the weekly
-[In Tech We Trust podcast](http://intechwetrustpodcast.com/). Follow him on
-[Twitter](https://twitter.com/nigelpoulton).
-
diff --git a/engine/admin/volumes/bind-mounts.md b/storage/bind-mounts.md
similarity index 99%
rename from engine/admin/volumes/bind-mounts.md
rename to storage/bind-mounts.md
index 7587c14314..ebd31e6993 100644
--- a/engine/admin/volumes/bind-mounts.md
+++ b/storage/bind-mounts.md
@@ -2,6 +2,8 @@
 description: Using bind mounts
 title: Use bind mounts
 keywords: storage, persistence, data persistence, mounts, bind mounts
+redirect_from:
+- /engine/admin/volumes/bind-mounts/
 ---
 
 Bind mounts have been around since the early days of Docker. Bind mounts have
@@ -438,4 +440,4 @@ $ docker run -d \
 
 - Learn about [volumes](volumes.md).
 - Learn about [tmpfs mounts](tmpfs.md).
-- Learn about [storage drivers](/engine/userguide/storagedriver.md).
+- Learn about [storage drivers](/storage/storagedriver/).
diff --git a/engine/admin/volumes/images/types-of-mounts-bind.png b/storage/images/types-of-mounts-bind.png
similarity index 100%
rename from engine/admin/volumes/images/types-of-mounts-bind.png
rename to storage/images/types-of-mounts-bind.png
diff --git a/engine/admin/volumes/images/types-of-mounts-tmpfs.png b/storage/images/types-of-mounts-tmpfs.png
similarity index 100%
rename from engine/admin/volumes/images/types-of-mounts-tmpfs.png
rename to storage/images/types-of-mounts-tmpfs.png
diff --git a/engine/admin/volumes/images/types-of-mounts-volume.png b/storage/images/types-of-mounts-volume.png
similarity index 100%
rename from engine/admin/volumes/images/types-of-mounts-volume.png
rename to storage/images/types-of-mounts-volume.png
diff --git a/engine/admin/volumes/images/types-of-mounts.png b/storage/images/types-of-mounts.png
similarity index 100%
rename from engine/admin/volumes/images/types-of-mounts.png
rename to storage/images/types-of-mounts.png
diff --git a/engine/admin/volumes/index.md b/storage/index.md
similarity index 98%
rename from engine/admin/volumes/index.md
rename to storage/index.md
index 9fb386fa86..b578cf44ff 100644
--- a/engine/admin/volumes/index.md
+++ b/storage/index.md
@@ -2,6 +2,8 @@
 description: Overview of persisting data in containers
 title: Manage data in Docker
 keywords: storage, persistence, data persistence, volumes, mounts, bind mounts
+redirect_from:
+- engine/admin/volumes/
 ---
 
 It is possible to store data within the writable layer of a container, but there
@@ -12,7 +14,7 @@ are some downsides:
 - A container's writable layer is tightly coupled to the host machine
   where the container is running. You can't easily move the data somewhere else.
 - Writing into a container's writable layer requires a
-  [storage driver](/engine/userguide/storagedriver.md) to manage the
+  [storage driver](/storage/storagedriver/) to manage the
   filesystem. The storage driver provides a union filesystem, using the Linux
   kernel. This extra abstraction reduces performance as compared to using
   _data volumes_, which write directly to the host filesystem.
@@ -175,6 +177,6 @@ If you use either bind mounts or volumes, keep the following in mind:
 - Learn more about [volumes](volumes.md).
 - Learn more about [bind mounts](bind-mounts.md).
 - Learn more about [tmpfs mounts](tmpfs.md).
-- Learn more about [storage drivers](/engine/userguide/storagedriver.md), which
+- Learn more about [storage drivers](/storage/storagedriver/), which
   are not related to bind mounts or volumes, but allow you to store data in a
   container's writable layer.
diff --git a/engine/userguide/storagedriver/aufs-driver.md b/storage/storagedriver/aufs-driver.md
similarity index 98%
rename from engine/userguide/storagedriver/aufs-driver.md
rename to storage/storagedriver/aufs-driver.md
index cd5debb017..0b0f777f00 100644
--- a/engine/userguide/storagedriver/aufs-driver.md
+++ b/storage/storagedriver/aufs-driver.md
@@ -2,6 +2,8 @@
 description: Learn how to optimize your use of AUFS driver.
 keywords: 'container, storage, driver, AUFS '
 title: Use the AUFS storage driver
+redirect_from:
+- /engine/userguide/storagedriver/aufs-driver/
 ---
 
 AUFS is a *union filesystem*. The `aufs` storage driver was previously the default
@@ -226,7 +228,7 @@ The following generic performance best practices also apply to AUFS.
 
 ## Related information
 
+* [Volumes](/storage/volumes.md)
 * [Understand images, containers, and storage drivers](imagesandcontainers.md)
 * [Select a storage driver](selectadriver.md)
-* [Btrfs storage driver in practice](btrfs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
+
diff --git a/engine/userguide/storagedriver/btrfs-driver.md b/storage/storagedriver/btrfs-driver.md
similarity index 99%
rename from engine/userguide/storagedriver/btrfs-driver.md
rename to storage/storagedriver/btrfs-driver.md
index 7ed3eab99e..546f725077 100644
--- a/engine/userguide/storagedriver/btrfs-driver.md
+++ b/storage/storagedriver/btrfs-driver.md
@@ -2,6 +2,8 @@
 description: Learn how to optimize your use of Btrfs driver.
 keywords: 'container, storage, driver, Btrfs '
 title: Use the BTRFS storage driver
+redirect_from:
+- /engine/userguide/storagedriver/btrfs-driver/
 ---
 
 Btrfs is a next generation copy-on-write filesystem that supports many advanced
@@ -311,7 +313,6 @@ storage driver.
 
 ## Related Information
 
+* [Volumes](/storage/volumes.md)
 * [Understand images, containers, and storage drivers](imagesandcontainers.md)
 * [Select a storage driver](selectadriver.md)
-* [AUFS storage driver in practice](aufs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
diff --git a/engine/userguide/storagedriver/device-mapper-driver.md b/storage/storagedriver/device-mapper-driver.md
similarity index 99%
rename from engine/userguide/storagedriver/device-mapper-driver.md
rename to storage/storagedriver/device-mapper-driver.md
index 7d49fd9d22..baf69c83c2 100644
--- a/engine/userguide/storagedriver/device-mapper-driver.md
+++ b/storage/storagedriver/device-mapper-driver.md
@@ -2,6 +2,8 @@
 description: Learn how to optimize your use of device mapper driver.
 keywords: container, storage, driver, device mapper
 title: Use the Device Mapper storage driver
+redirect_from:
+- /engine/userguide/storagedriver/device-mapper-driver/
 ---
 
 Device Mapper is a kernel-based framework that underpins many advanced
@@ -813,8 +815,6 @@ storage driver.
 
 ## Related Information
 
+* [Volumes](/storage/volumes.md)
 * [Understand images, containers, and storage drivers](imagesandcontainers.md)
 * [Select a storage driver](selectadriver.md)
-* [AUFS storage driver in practice](aufs-driver.md)
-* [Btrfs storage driver in practice](btrfs-driver.md)
-* [daemon reference](../../reference/commandline/dockerd.md#storage-driver-options)
diff --git a/engine/userguide/storagedriver/images/aufs_delete.jpg b/storage/storagedriver/images/aufs_delete.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/aufs_delete.jpg
rename to storage/storagedriver/images/aufs_delete.jpg
diff --git a/engine/userguide/storagedriver/images/aufs_layers.jpg b/storage/storagedriver/images/aufs_layers.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/aufs_layers.jpg
rename to storage/storagedriver/images/aufs_layers.jpg
diff --git a/engine/userguide/storagedriver/images/aufs_metadata.jpg b/storage/storagedriver/images/aufs_metadata.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/aufs_metadata.jpg
rename to storage/storagedriver/images/aufs_metadata.jpg
diff --git a/engine/userguide/storagedriver/images/base_device.jpg b/storage/storagedriver/images/base_device.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/base_device.jpg
rename to storage/storagedriver/images/base_device.jpg
diff --git a/engine/userguide/storagedriver/images/btfs_constructs.jpg b/storage/storagedriver/images/btfs_constructs.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_constructs.jpg
rename to storage/storagedriver/images/btfs_constructs.jpg
diff --git a/engine/userguide/storagedriver/images/btfs_container_layer.jpg b/storage/storagedriver/images/btfs_container_layer.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_container_layer.jpg
rename to storage/storagedriver/images/btfs_container_layer.jpg
diff --git a/engine/userguide/storagedriver/images/btfs_layers.png b/storage/storagedriver/images/btfs_layers.png
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_layers.png
rename to storage/storagedriver/images/btfs_layers.png
diff --git a/engine/userguide/storagedriver/images/btfs_pool.jpg b/storage/storagedriver/images/btfs_pool.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_pool.jpg
rename to storage/storagedriver/images/btfs_pool.jpg
diff --git a/engine/userguide/storagedriver/images/btfs_snapshots.jpg b/storage/storagedriver/images/btfs_snapshots.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_snapshots.jpg
rename to storage/storagedriver/images/btfs_snapshots.jpg
diff --git a/engine/userguide/storagedriver/images/btfs_subvolume.jpg b/storage/storagedriver/images/btfs_subvolume.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/btfs_subvolume.jpg
rename to storage/storagedriver/images/btfs_subvolume.jpg
diff --git a/engine/userguide/storagedriver/images/container-layers-cas.jpg b/storage/storagedriver/images/container-layers-cas.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/container-layers-cas.jpg
rename to storage/storagedriver/images/container-layers-cas.jpg
diff --git a/engine/userguide/storagedriver/images/container-layers.jpg b/storage/storagedriver/images/container-layers.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/container-layers.jpg
rename to storage/storagedriver/images/container-layers.jpg
diff --git a/engine/userguide/storagedriver/images/dm_container.jpg b/storage/storagedriver/images/dm_container.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/dm_container.jpg
rename to storage/storagedriver/images/dm_container.jpg
diff --git a/engine/userguide/storagedriver/images/driver-pros-cons.png b/storage/storagedriver/images/driver-pros-cons.png
similarity index 100%
rename from engine/userguide/storagedriver/images/driver-pros-cons.png
rename to storage/storagedriver/images/driver-pros-cons.png
diff --git a/engine/userguide/storagedriver/images/image-layers.jpg b/storage/storagedriver/images/image-layers.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/image-layers.jpg
rename to storage/storagedriver/images/image-layers.jpg
diff --git a/engine/userguide/storagedriver/images/lsblk-diagram.jpg b/storage/storagedriver/images/lsblk-diagram.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/lsblk-diagram.jpg
rename to storage/storagedriver/images/lsblk-diagram.jpg
diff --git a/engine/userguide/storagedriver/images/overlay_constructs.jpg b/storage/storagedriver/images/overlay_constructs.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/overlay_constructs.jpg
rename to storage/storagedriver/images/overlay_constructs.jpg
diff --git a/engine/userguide/storagedriver/images/overlay_constructs2.jpg b/storage/storagedriver/images/overlay_constructs2.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/overlay_constructs2.jpg
rename to storage/storagedriver/images/overlay_constructs2.jpg
diff --git a/engine/userguide/storagedriver/images/saving-space.jpg b/storage/storagedriver/images/saving-space.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/saving-space.jpg
rename to storage/storagedriver/images/saving-space.jpg
diff --git a/engine/userguide/storagedriver/images/shared-uuid.jpg b/storage/storagedriver/images/shared-uuid.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/shared-uuid.jpg
rename to storage/storagedriver/images/shared-uuid.jpg
diff --git a/engine/userguide/storagedriver/images/shared-volume.jpg b/storage/storagedriver/images/shared-volume.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/shared-volume.jpg
rename to storage/storagedriver/images/shared-volume.jpg
diff --git a/engine/userguide/storagedriver/images/sharing-layers.jpg b/storage/storagedriver/images/sharing-layers.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/sharing-layers.jpg
rename to storage/storagedriver/images/sharing-layers.jpg
diff --git a/engine/userguide/storagedriver/images/two_dm_container.jpg b/storage/storagedriver/images/two_dm_container.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/two_dm_container.jpg
rename to storage/storagedriver/images/two_dm_container.jpg
diff --git a/engine/userguide/storagedriver/images/zfs_clones.jpg b/storage/storagedriver/images/zfs_clones.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/zfs_clones.jpg
rename to storage/storagedriver/images/zfs_clones.jpg
diff --git a/engine/userguide/storagedriver/images/zfs_zpool.jpg b/storage/storagedriver/images/zfs_zpool.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/zfs_zpool.jpg
rename to storage/storagedriver/images/zfs_zpool.jpg
diff --git a/engine/userguide/storagedriver/images/zpool_blocks.jpg b/storage/storagedriver/images/zpool_blocks.jpg
similarity index 100%
rename from engine/userguide/storagedriver/images/zpool_blocks.jpg
rename to storage/storagedriver/images/zpool_blocks.jpg
diff --git a/engine/userguide/storagedriver/imagesandcontainers.md b/storage/storagedriver/index.md
similarity index 96%
rename from engine/userguide/storagedriver/imagesandcontainers.md
rename to storage/storagedriver/index.md
index 206c4740c3..25b91e7efa 100644
--- a/engine/userguide/storagedriver/imagesandcontainers.md
+++ b/storage/storagedriver/index.md
@@ -1,16 +1,24 @@
 ---
 description: Learn the technologies that support storage drivers.
 keywords: container, storage, driver, AUFS, btfs, devicemapper,zvfs
-title: About images, containers, and storage drivers
+title: About storage drivers
 redirect_from:
 - /en/latest/terms/layer/
 - /engine/installation/userguide/storagedriver/
+- /engine/userguide/storagedriver/imagesandcontainers/
 ---
 
 To use storage drivers effectively, it's important to know how Docker builds and
 stores images, how these images are used by containers. You can use this
 information to make informed choices about the best way to persist data from
-your applications and  avoid performance problems along the way.
+your applications and avoid performance problems along the way.
+
+> **Note**: Storage drivers allow you to persist data in the writable layer of
+> your container. This is the least efficient way to persist data.
+> [Volumes](/storage/volumes/) or [bind mounts](/storage/bind-mounts/) provide
+> much better read and write performance, and volumes provide more security
+> and isolation than either storage drivers or bind mounts. Neither volumes nor
+> bind mounts use most of the concepts described in this topic.
 
 ## Images and layers
 
@@ -417,7 +425,5 @@ For detailed information about data volumes, see
 
 ## Related information
 
+* [Volumes](/storage/volumes.md)
 * [Select a storage driver](selectadriver.md)
-* [AUFS storage driver in practice](aufs-driver.md)
-* [Btrfs storage driver in practice](btrfs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
diff --git a/engine/userguide/storagedriver/overlayfs-driver.md b/storage/storagedriver/overlayfs-driver.md
similarity index 99%
rename from engine/userguide/storagedriver/overlayfs-driver.md
rename to storage/storagedriver/overlayfs-driver.md
index 57f9440888..82ed336564 100644
--- a/engine/userguide/storagedriver/overlayfs-driver.md
+++ b/storage/storagedriver/overlayfs-driver.md
@@ -2,11 +2,13 @@
 description: Learn how to optimize your use of OverlayFS driver.
 keywords: container, storage, driver, OverlayFS
 title: Use the OverlayFS storage driver
+redirect_from:
+- /engine/userguide/storagedriver/overlayfs-driver/
 ---
 
 OverlayFS is a modern *union filesystem* that is similar to AUFS, but faster
-and with a simpler implementation. Docker provides a storage driver for
-OverlayFS.
+and with a simpler implementation. Docker provides two storage drivers for
+OverlayFS: the original `overlay`, and the newer and more stable `overlay2`.
 
 This topic refers to the Linux kernel driver as `OverlayFS` and to the Docker
 storage driver as `overlay` or `overlay2`.
diff --git a/engine/userguide/storagedriver/selectadriver.md b/storage/storagedriver/select-storage-driver.md
similarity index 98%
rename from engine/userguide/storagedriver/selectadriver.md
rename to storage/storagedriver/select-storage-driver.md
index e5c4b82684..3c665cd512 100644
--- a/engine/userguide/storagedriver/selectadriver.md
+++ b/storage/storagedriver/select-storage-driver.md
@@ -1,7 +1,10 @@
 ---
 description: Learn how to select the proper storage driver for your container.
-keywords: container, storage, driver, AUFS, btfs, devicemapper,zvfs
-title: Select a storage driver
+keywords: container, storage, driver, aufs, btrfs, devicemapper, zfs, overlay, overlay2
+title: Docker storage drivers
+redirect_from:
+- /engine/userguide/storagedriver/
+- /engine/userguide/storagedriver/selectadriver/
 ---
 
 Ideally, very little data is written to a container's writable layer, and you
@@ -236,3 +239,6 @@ to physical or logical disks on the Docker host.
 * [`overlay` and `overlay2` storage drivers in practice](overlayfs-driver.md)
 * [`btrfs` storage driver in practice](btrfs-driver.md)
 * [`zfs` storage driver in practice](zfs-driver.md)
+
+
+
diff --git a/engine/userguide/storagedriver/vfs-driver.md b/storage/storagedriver/vfs-driver.md
similarity index 94%
rename from engine/userguide/storagedriver/vfs-driver.md
rename to storage/storagedriver/vfs-driver.md
index 9b5d84a637..989b2970d1 100644
--- a/engine/userguide/storagedriver/vfs-driver.md
+++ b/storage/storagedriver/vfs-driver.md
@@ -2,6 +2,8 @@
 description: Learn how to optimize your use of VFS driver.
 keywords: 'container, storage, driver, vfs'
 title: Use the VFS storage driver
+redirect_from:
+- /engine/userguide/storagedriver/vfs-driver/
 ---
 
 The VFS storage driver is not a union filesystem; instead, each layer is a
@@ -130,9 +132,6 @@ same amount of room on disk. This is one of the disadvantages of using the
 
 ## Related information
 
+* [Volumes](/storage/volumes.md)
 * [Understand images, containers, and storage drivers](imagesandcontainers.md)
-* [Select a storage driver](selectadriver.md)
-* [AUFS storage driver in practice](aufs-driver.md)
-* [OverlayFS storage driver in practice](overlayfs-driver.md)
-* [Btrfs storage driver in practice](btrfs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
+
diff --git a/engine/userguide/storagedriver/zfs-driver.md b/storage/storagedriver/zfs-driver.md
similarity index 99%
rename from engine/userguide/storagedriver/zfs-driver.md
rename to storage/storagedriver/zfs-driver.md
index 82f93f1cf9..7f633d1a71 100644
--- a/engine/userguide/storagedriver/zfs-driver.md
+++ b/storage/storagedriver/zfs-driver.md
@@ -2,6 +2,8 @@
 description: Learn how to optimize your use of ZFS driver.
 keywords: 'container, storage, driver, ZFS '
 title: Use the ZFS storage driver
+redirect_from:
+- /engine/userguide/storagedriver/zfs-driver/
 ---
 
 ZFS is a next generation filesystem that supports many advanced storage
diff --git a/engine/admin/volumes/tmpfs.md b/storage/tmpfs.md
similarity index 98%
rename from engine/admin/volumes/tmpfs.md
rename to storage/tmpfs.md
index a71021ace9..b1232b43f9 100644
--- a/engine/admin/volumes/tmpfs.md
+++ b/storage/tmpfs.md
@@ -2,6 +2,8 @@
 description: Using tmpfs mounts
 title: Use tmpfs mounts
 keywords: storage, persistence, data persistence, tmpfs
+redirect_from:
+- /engine/admin/volumes/tmpfs/
 ---
 
 [Volumes](volumes.md) and [bind mounts](bind-mounts.md) are mounted into the
@@ -143,4 +145,4 @@ docker run -d \
 
 - Learn about [volumes](volumes.md)
 - Learn about [bind mounts](bind-mounts.md)
-- Learn about [storage drivers](/engine/userguide/storagedriver.md)
+- Learn about [storage drivers](/storage/storagedriver/)
diff --git a/engine/admin/troubleshooting_volume_errors.md b/storage/troubleshooting_volume_errors.md
similarity index 97%
rename from engine/admin/troubleshooting_volume_errors.md
rename to storage/troubleshooting_volume_errors.md
index d68b61cf52..388af6411c 100644
--- a/engine/admin/troubleshooting_volume_errors.md
+++ b/storage/troubleshooting_volume_errors.md
@@ -2,6 +2,8 @@
 description: Troubleshooting volume errors
 keywords: cadvisor, troubleshooting, volumes, bind-mounts
 title: Troubleshoot volume errors
+redirect_from:
+- /engine/admin/troubleshooting_volume_errors/
 ---
 
 This topic discusses errors which may occur when you use Docker volumes or bind
diff --git a/engine/admin/volumes/volumes.md b/storage/volumes.md
similarity index 99%
rename from engine/admin/volumes/volumes.md
rename to storage/volumes.md
index 85addaa442..5c22496ded 100644
--- a/engine/admin/volumes/volumes.md
+++ b/storage/volumes.md
@@ -5,6 +5,7 @@ keywords: storage, persistence, data persistence, volumes
 redirect_from:
 - /engine/tutorials/dockervolumes/
 - /engine/userguide/dockervolumes/
+- /engine/admin/volumes/volumes/
 ---
 
 Volumes are the preferred mechanism for persisting data generated by and used
@@ -411,4 +412,4 @@ $ docker run -d \
 
 - Learn about [bind mounts](bind-mounts.md).
 - Learn about [tmpfs mounts](tmpfs.md).
-- Learn about [storage drivers](/engine/userguide/storagedriver.md).
+- Learn about [storage drivers](/storage/storagedriver/).