diff --git a/SUMMARY.md b/SUMMARY.md
index 2575cd8..a10e882 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -18,50 +18,50 @@
 ## Developing With NATS
 
 * [Introduction](developing-with-nats/developer.md)
-* [Connecting](developing-with-nats/intro/README.md)
-  * [Connecting to the Default Server](developing-with-nats/intro/default_server.md)
-  * [Connecting to a Specific Server](developing-with-nats/intro/specific_server.md)
-  * [Connecting to a Cluster](developing-with-nats/intro/cluster.md)
-  * [Setting a Connect Timeout](developing-with-nats/intro/connect_timeout.md)
-  * [Ping/Pong Protocol](developing-with-nats/intro/pingpong.md)
-  * [Controlling the Client/Server Protocol](developing-with-nats/intro/protocol.md)
-  * [Turning Off Echo'd Messages](developing-with-nats/intro/noecho.md)
-* [Automatic Reconnections](developing-with-nats/intro-1/README.md)
-  * [Disabling Reconnect](developing-with-nats/intro-1/disable.md)
-  * [Set the Number of Reconnect Attempts](developing-with-nats/intro-1/max.md)
-  * [Pausing Between Reconnect Attempts](developing-with-nats/intro-1/wait.md)
-  * [Avoiding the Thundering Herd](developing-with-nats/intro-1/random.md)
-  * [Listening for Reconnect Events](developing-with-nats/intro-1/events.md)
-  * [Buffering Messages During Reconnect Attempts](developing-with-nats/intro-1/buffer.md)
-* [Securing Connections](developing-with-nats/intro-2/README.md)
+* [Connecting](developing-with-nats/connecting/README.md)
+  * [Connecting to the Default Server](developing-with-nats/connecting/default_server.md)
+  * [Connecting to a Specific Server](developing-with-nats/connecting/specific_server.md)
+  * [Connecting to a Cluster](developing-with-nats/connecting/cluster.md)
+  * [Setting a Connect Timeout](developing-with-nats/connecting/connect_timeout.md)
+  * [Ping/Pong Protocol](developing-with-nats/connecting/pingpong.md)
+  * [Controlling the Client/Server Protocol](developing-with-nats/connecting/protocol.md)
+  * [Turning Off Echo'd Messages](developing-with-nats/connecting/noecho.md)
+* [Automatic Reconnections](developing-with-nats/reconnect/README.md)
+  * [Disabling Reconnect](developing-with-nats/reconnect/disable.md)
+  * [Set the Number of Reconnect Attempts](developing-with-nats/reconnect/max.md)
+  * [Pausing Between Reconnect Attempts](developing-with-nats/reconnect/wait.md)
+  * [Avoiding the Thundering Herd](developing-with-nats/reconnect/random.md)
+  * [Listening for Reconnect Events](developing-with-nats/reconnect/events.md)
+  * [Buffering Messages During Reconnect Attempts](developing-with-nats/reconnect/buffer.md)
+* [Securing Connections](developing-with-nats/security/README.md)
   * [Authenticating with a User and Password](developing-with-nats/intro-2/userpass.md)
-  * [Authenticating with a Token](developing-with-nats/intro-2/token.md)
-  * [Authenticating with an NKey](developing-with-nats/intro-2/nkey.md)
-  * [Authenticating with a Credentials File](developing-with-nats/intro-2/creds.md)
-  * [Encrypting Connections with TLS](developing-with-nats/intro-2/tls.md)
-* [Receiving Messages](developing-with-nats/intro-3/README.md)
-  * [Synchronous Subscriptions](developing-with-nats/intro-3/sync.md)
-  * [Asynchronous Subscriptions](developing-with-nats/intro-3/async.md)
-  * [Unsubscribing](developing-with-nats/intro-3/unsubscribing.md)
-  * [Unsubscribing After N Messages](developing-with-nats/intro-3/unsub_after.md)
-  * [Replying to a Message](developing-with-nats/intro-3/reply.md)
-  * [Wildcard Subscriptions](developing-with-nats/intro-3/wildcards.md)
-  * [Queue Subscriptions](developing-with-nats/intro-3/queues.md)
-  * [Draining Messages Before Disconnect](developing-with-nats/intro-3/drain.md)
-  * [Structured Data](developing-with-nats/intro-3/structure.md)
-* [Sending Messages](developing-with-nats/intro-4/README.md)
-  * [Including a Reply Subject](developing-with-nats/intro-4/replyto.md)
-  * [Request-Reply Semantics](developing-with-nats/intro-4/request_reply.md)
-  * [Caches, Flush and Ping](developing-with-nats/intro-4/caches.md)
-  * [Sending Structured Data](developing-with-nats/intro-4/structure.md)
-* [Monitoring the Connection](developing-with-nats/intro-5/README.md)
-  * [Listen for Connection Events](developing-with-nats/intro-5/events.md)
-  * [Slow Consumers](developing-with-nats/intro-5/slow.md)
-* [Tutorials](developing-with-nats/intro-6/README.md)
-  * [Explore NATS Pub/Sub](developing-with-nats/intro-6/pubsub.md)
-  * [Explore NATS Request/Reply](developing-with-nats/intro-6/reqreply.md)
-  * [Explore NATS Queueing](developing-with-nats/intro-6/queues.md)
-  * [Advanced Connect and Custom Dialer in Go](developing-with-nats/intro-6/custom_dialer.md)
+  * [Authenticating with a Token](developing-with-nats/security/token.md)
+  * [Authenticating with an NKey](developing-with-nats/security/nkey.md)
+  * [Authenticating with a Credentials File](developing-with-nats/security/creds.md)
+  * [Encrypting Connections with TLS](developing-with-nats/security/tls.md)
+* [Receiving Messages](developing-with-nats/receiving/README.md)
+  * [Synchronous Subscriptions](developing-with-nats/receiving/sync.md)
+  * [Asynchronous Subscriptions](developing-with-nats/receiving/async.md)
+  * [Unsubscribing](developing-with-nats/receiving/unsubscribing.md)
+  * [Unsubscribing After N Messages](developing-with-nats/receiving/unsub_after.md)
+  * [Replying to a Message](developing-with-nats/receiving/reply.md)
+  * [Wildcard Subscriptions](developing-with-nats/receiving/wildcards.md)
+  * [Queue Subscriptions](developing-with-nats/receiving/queues.md)
+  * [Draining Messages Before Disconnect](developing-with-nats/receiving/drain.md)
+  * [Structured Data](developing-with-nats/receiving/structure.md)
+* [Sending Messages](developing-with-nats/sending/README.md)
+  * [Including a Reply Subject](developing-with-nats/sending/replyto.md)
+  * [Request-Reply Semantics](developing-with-nats/sending/request_reply.md)
+  * [Caches, Flush and Ping](developing-with-nats/sending/caches.md)
+  * [Sending Structured Data](developing-with-nats/sending/structure.md)
+* [Monitoring the Connection](developing-with-nats/events/README.md)
+  * [Listen for Connection Events](developing-with-nats/events/events.md)
+  * [Slow Consumers](developing-with-nats/events/slow.md)
+* [Tutorials](developing-with-nats/tutorials/README.md)
+  * [Explore NATS Pub/Sub](developing-with-nats/tutorials/pubsub.md)
+  * [Explore NATS Request/Reply](developing-with-nats/tutorials/reqreply.md)
+  * [Explore NATS Queueing](developing-with-nats/tutorials/queues.md)
+  * [Advanced Connect and Custom Dialer in Go](developing-with-nats/tutorials/custom_dialer.md)
 
 ## NATS Server