diff --git a/SUMMARY.md b/SUMMARY.md
index 421072e..eb642bc 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -3,68 +3,6 @@
 * [Introduction](README.md)
 * [What's New in 2.0](whats_new/whats_new_20.md)
 
-## NATS Server
-
-* [Installing](nats_server/installation.md)
-* [Running](nats_server/running.md)
-  * [Window Service](nats_server/windows_srv.md)
-* [Clients](nats_server/clients.md)
-* [Flags](nats_server/flags.md)
-* [Configuration](nats_server/configuration.md)
-  * [Securing NATS](nats_server/securing_nats.md)
-    * [Enabling TLS](nats_server/tls.md)
-    * [Authentication](nats_server/auth_intro.md)
-      * [Tokens](nats_server/tokens.md)
-      * [Username/Password](nats_server/username_password.md)
-      * [TLS Authentication](nats_server/tls_mutual_auth.md)
-      * [NKeys](nats_server/nkey_auth.md)
-      * [Accounts](nats_server/jwt_auth.md)
-      * [Authentication Timeout](nats_server/auth_timeout.md)
-    * [Authorization](nats_server/authorization.md)
-  * [Clustering](nats_server/clustering.md)
-    * [Configuration](nats_server/cluster_config.md)
-    * [TLS Authentication](nats_server/cluster_tls.md)
-  * [Gateways](gateways/README.md)
-    * [Configuration](gateways/gateway.md)
-  * [Leaf Nodes](leafnodes/README.md)
-    * [Configuration](leafnodes/leafnode_conf.md)
-  * [Logging](nats_server/logging.md)
-  * [Monitoring](nats_server/monitoring.md)
-* [Managing A NATS Server](nats_admin/README.md)
-  * [Upgrading a Cluster](nats_admin/upgrading_cluster.md)
-  * [Slow Consumers](nats_admin/slow_consumers.md)
-  * [Signals](nats_admin/signals.md)
-  * [System Accounts](sys_accounts/README.md)
-    * [Configuration](sys_accounts/sys_accounts.md)
-* [NATS and Docker](nats_docker/README.md)
-  * [Tutorial](nats_docker/tutorial.md)
-  * [Docker Swarm](nats_docker/docker_swarm.md)
-
-## NATS Streaming Server
-
-* [Basics](nats_streaming/nats-streaming-intro.md)
-* [Installing](nats_streaming/nats-streaming-install.md)
-  * [Securing](nats_streaming/nats-streaming-tls.md)
-* [Protocol](nats_streaming/nats-streaming-protocol.md)
-* [Docker Swarm](nats_streaming/nats-streaming-swarm.md)
-
-## NATS Tools
-
-* [mkpasswd](nats_tools/mkpasswd.md)
-* [nk](nats_tools/nk.md)
-* [nsc](nats_tools/nsc/README.md)
-  * [Basics](nats_tools/nsc/nsc.md)
-  * [Streams](nats_tools/nsc/streams.md)
-  * [Services](nats_tools/nsc/services.md)
-  * [Signing Keys](nats_tools/nsc/signing_keys.md)
-* [nats-account-server](nats_tools/nas/README.md)
-  * [Basics](nats_tools/nas/nas_conf.md)
-  * [Inspecting JWTs](nats_tools/nas/inspecting_jwts.md)
-  * [Memory Resolver](nats_tools/nas/mem_resolver.md)
-* [nats-top](nats_tools/nats_top/README.md)
-  * [Tutorial](nats_tools/nats_top/tutorial.md)
-* [nats-bench](nats_tools/natsbench.md)
-
 ## Developing With NATS
 
 * [Introduction](developer/README.md)
@@ -128,6 +66,60 @@
   * [Explore NATS Queueing](developer/tutorials/queues.md)
   * [Advanced Connect and Custom Dialer in Go](developer/tutorials/custom_dialer.md)
 
+## NATS Server
+
+* [Installing](nats_server/installation.md)
+* [Running](nats_server/running.md)
+  * [Window Service](nats_server/windows_srv.md)
+* [Clients](nats_server/clients.md)
+* [Flags](nats_server/flags.md)
+* [Configuration](nats_server/configuration.md)
+  * [Securing NATS](nats_server/securing_nats.md)
+    * [Enabling TLS](nats_server/tls.md)
+    * [Authentication](nats_server/auth_intro.md)
+      * [Tokens](nats_server/tokens.md)
+      * [Username/Password](nats_server/username_password.md)
+      * [TLS Authentication](nats_server/tls_mutual_auth.md)
+      * [NKeys](nats_server/nkey_auth.md)
+      * [Accounts](nats_server/jwt_auth.md)
+      * [Authentication Timeout](nats_server/auth_timeout.md)
+    * [Authorization](nats_server/authorization.md)
+  * [Clustering](nats_server/clustering.md)
+    * [Configuration](nats_server/cluster_config.md)
+    * [TLS Authentication](nats_server/cluster_tls.md)
+  * [Gateways](gateways/README.md)
+    * [Configuration](gateways/gateway.md)
+  * [Leaf Nodes](leafnodes/README.md)
+    * [Configuration](leafnodes/leafnode_conf.md)
+  * [Logging](nats_server/logging.md)
+  * [Monitoring](nats_server/monitoring.md)
+* [Managing A NATS Server](nats_admin/README.md)
+  * [Upgrading a Cluster](nats_admin/upgrading_cluster.md)
+  * [Slow Consumers](nats_admin/slow_consumers.md)
+  * [Signals](nats_admin/signals.md)
+  * [System Accounts](sys_accounts/README.md)
+    * [Configuration](sys_accounts/sys_accounts.md)
+* [NATS and Docker](nats_docker/README.md)
+  * [Tutorial](nats_docker/tutorial.md)
+  * [Docker Swarm](nats_docker/docker_swarm.md)
+
+## NATS Tools
+
+* [mkpasswd](nats_tools/mkpasswd.md)
+* [nk](nats_tools/nk.md)
+* [nsc](nats_tools/nsc/README.md)
+  * [Basics](nats_tools/nsc/nsc.md)
+  * [Streams](nats_tools/nsc/streams.md)
+  * [Services](nats_tools/nsc/services.md)
+  * [Signing Keys](nats_tools/nsc/signing_keys.md)
+* [nats-account-server](nats_tools/nas/README.md)
+  * [Basics](nats_tools/nas/nas_conf.md)
+  * [Inspecting JWTs](nats_tools/nas/inspecting_jwts.md)
+  * [Memory Resolver](nats_tools/nas/mem_resolver.md)
+* [nats-top](nats_tools/nats_top/README.md)
+  * [Tutorial](nats_tools/nats_top/tutorial.md)
+* [nats-bench](nats_tools/natsbench.md)
+
 ## Developing With NATS Streaming
 
 * [Introduction](developer/streaming/README.md)
@@ -138,6 +130,14 @@
 * [Queue Subscriptions](developer/streaming/queues.md)
 * [Acknowledgements](developer/streaming/acks.md)
 
+## NATS Streaming Server
+
+* [Basics](nats_streaming/nats-streaming-intro.md)
+* [Installing](nats_streaming/nats-streaming-install.md)
+  * [Securing](nats_streaming/nats-streaming-tls.md)
+* [Protocol](nats_streaming/nats-streaming-protocol.md)
+* [Docker Swarm](nats_streaming/nats-streaming-swarm.md)
+
 ## NATS Protocol
 
 * [Protocol Demo](nats_protocol/nats-protocol-demo.md)