diff --git a/developing-with-nats/intro/README.md b/developing-with-nats/connecting/README.md
similarity index 100%
rename from developing-with-nats/intro/README.md
rename to developing-with-nats/connecting/README.md
diff --git a/developing-with-nats/intro/cluster.md b/developing-with-nats/connecting/cluster.md
similarity index 100%
rename from developing-with-nats/intro/cluster.md
rename to developing-with-nats/connecting/cluster.md
diff --git a/developing-with-nats/intro/connect_timeout.md b/developing-with-nats/connecting/connect_timeout.md
similarity index 100%
rename from developing-with-nats/intro/connect_timeout.md
rename to developing-with-nats/connecting/connect_timeout.md
diff --git a/developing-with-nats/intro/default_server.md b/developing-with-nats/connecting/default_server.md
similarity index 100%
rename from developing-with-nats/intro/default_server.md
rename to developing-with-nats/connecting/default_server.md
diff --git a/developing-with-nats/intro/noecho.md b/developing-with-nats/connecting/noecho.md
similarity index 100%
rename from developing-with-nats/intro/noecho.md
rename to developing-with-nats/connecting/noecho.md
diff --git a/developing-with-nats/intro/pingpong.md b/developing-with-nats/connecting/pingpong.md
similarity index 100%
rename from developing-with-nats/intro/pingpong.md
rename to developing-with-nats/connecting/pingpong.md
diff --git a/developing-with-nats/intro/protocol.md b/developing-with-nats/connecting/protocol.md
similarity index 100%
rename from developing-with-nats/intro/protocol.md
rename to developing-with-nats/connecting/protocol.md
diff --git a/developing-with-nats/intro/specific_server.md b/developing-with-nats/connecting/specific_server.md
similarity index 100%
rename from developing-with-nats/intro/specific_server.md
rename to developing-with-nats/connecting/specific_server.md
diff --git a/developing-with-nats/intro-5/README.md b/developing-with-nats/events/README.md
similarity index 100%
rename from developing-with-nats/intro-5/README.md
rename to developing-with-nats/events/README.md
diff --git a/developing-with-nats/intro-5/events.md b/developing-with-nats/events/events.md
similarity index 100%
rename from developing-with-nats/intro-5/events.md
rename to developing-with-nats/events/events.md
diff --git a/developing-with-nats/intro-5/slow.md b/developing-with-nats/events/slow.md
similarity index 100%
rename from developing-with-nats/intro-5/slow.md
rename to developing-with-nats/events/slow.md
diff --git a/developing-with-nats/intro-3/README.md b/developing-with-nats/receiving/README.md
similarity index 100%
rename from developing-with-nats/intro-3/README.md
rename to developing-with-nats/receiving/README.md
diff --git a/developing-with-nats/intro-3/async.md b/developing-with-nats/receiving/async.md
similarity index 100%
rename from developing-with-nats/intro-3/async.md
rename to developing-with-nats/receiving/async.md
diff --git a/developing-with-nats/intro-3/drain.md b/developing-with-nats/receiving/drain.md
similarity index 100%
rename from developing-with-nats/intro-3/drain.md
rename to developing-with-nats/receiving/drain.md
diff --git a/developing-with-nats/intro-3/queues.md b/developing-with-nats/receiving/queues.md
similarity index 100%
rename from developing-with-nats/intro-3/queues.md
rename to developing-with-nats/receiving/queues.md
diff --git a/developing-with-nats/intro-3/reply.md b/developing-with-nats/receiving/reply.md
similarity index 100%
rename from developing-with-nats/intro-3/reply.md
rename to developing-with-nats/receiving/reply.md
diff --git a/developing-with-nats/intro-3/structure.md b/developing-with-nats/receiving/structure.md
similarity index 100%
rename from developing-with-nats/intro-3/structure.md
rename to developing-with-nats/receiving/structure.md
diff --git a/developing-with-nats/intro-3/sync.md b/developing-with-nats/receiving/sync.md
similarity index 100%
rename from developing-with-nats/intro-3/sync.md
rename to developing-with-nats/receiving/sync.md
diff --git a/developing-with-nats/intro-3/unsub_after.md b/developing-with-nats/receiving/unsub_after.md
similarity index 100%
rename from developing-with-nats/intro-3/unsub_after.md
rename to developing-with-nats/receiving/unsub_after.md
diff --git a/developing-with-nats/intro-3/unsubscribing.md b/developing-with-nats/receiving/unsubscribing.md
similarity index 100%
rename from developing-with-nats/intro-3/unsubscribing.md
rename to developing-with-nats/receiving/unsubscribing.md
diff --git a/developing-with-nats/intro-3/wildcards.md b/developing-with-nats/receiving/wildcards.md
similarity index 100%
rename from developing-with-nats/intro-3/wildcards.md
rename to developing-with-nats/receiving/wildcards.md
diff --git a/developing-with-nats/intro-1/README.md b/developing-with-nats/reconnect/README.md
similarity index 100%
rename from developing-with-nats/intro-1/README.md
rename to developing-with-nats/reconnect/README.md
diff --git a/developing-with-nats/intro-1/buffer.md b/developing-with-nats/reconnect/buffer.md
similarity index 100%
rename from developing-with-nats/intro-1/buffer.md
rename to developing-with-nats/reconnect/buffer.md
diff --git a/developing-with-nats/intro-1/disable.md b/developing-with-nats/reconnect/disable.md
similarity index 100%
rename from developing-with-nats/intro-1/disable.md
rename to developing-with-nats/reconnect/disable.md
diff --git a/developing-with-nats/intro-1/events.md b/developing-with-nats/reconnect/events.md
similarity index 100%
rename from developing-with-nats/intro-1/events.md
rename to developing-with-nats/reconnect/events.md
diff --git a/developing-with-nats/intro-1/max.md b/developing-with-nats/reconnect/max.md
similarity index 100%
rename from developing-with-nats/intro-1/max.md
rename to developing-with-nats/reconnect/max.md
diff --git a/developing-with-nats/intro-1/random.md b/developing-with-nats/reconnect/random.md
similarity index 100%
rename from developing-with-nats/intro-1/random.md
rename to developing-with-nats/reconnect/random.md
diff --git a/developing-with-nats/intro-1/wait.md b/developing-with-nats/reconnect/wait.md
similarity index 100%
rename from developing-with-nats/intro-1/wait.md
rename to developing-with-nats/reconnect/wait.md
diff --git a/developing-with-nats/intro-2/README.md b/developing-with-nats/security/README.md
similarity index 100%
rename from developing-with-nats/intro-2/README.md
rename to developing-with-nats/security/README.md
diff --git a/developing-with-nats/intro-2/creds.md b/developing-with-nats/security/creds.md
similarity index 100%
rename from developing-with-nats/intro-2/creds.md
rename to developing-with-nats/security/creds.md
diff --git a/developing-with-nats/intro-2/nkey.md b/developing-with-nats/security/nkey.md
similarity index 100%
rename from developing-with-nats/intro-2/nkey.md
rename to developing-with-nats/security/nkey.md
diff --git a/developing-with-nats/intro-2/tls.md b/developing-with-nats/security/tls.md
similarity index 100%
rename from developing-with-nats/intro-2/tls.md
rename to developing-with-nats/security/tls.md
diff --git a/developing-with-nats/intro-2/token.md b/developing-with-nats/security/token.md
similarity index 100%
rename from developing-with-nats/intro-2/token.md
rename to developing-with-nats/security/token.md
diff --git a/developing-with-nats/intro-2/userpass.md b/developing-with-nats/security/userpass.md
similarity index 100%
rename from developing-with-nats/intro-2/userpass.md
rename to developing-with-nats/security/userpass.md
diff --git a/developing-with-nats/intro-4/README.md b/developing-with-nats/sending/README.md
similarity index 100%
rename from developing-with-nats/intro-4/README.md
rename to developing-with-nats/sending/README.md
diff --git a/developing-with-nats/intro-4/caches.md b/developing-with-nats/sending/caches.md
similarity index 100%
rename from developing-with-nats/intro-4/caches.md
rename to developing-with-nats/sending/caches.md
diff --git a/developing-with-nats/intro-4/replyto.md b/developing-with-nats/sending/replyto.md
similarity index 100%
rename from developing-with-nats/intro-4/replyto.md
rename to developing-with-nats/sending/replyto.md
diff --git a/developing-with-nats/intro-4/request_reply.md b/developing-with-nats/sending/request_reply.md
similarity index 100%
rename from developing-with-nats/intro-4/request_reply.md
rename to developing-with-nats/sending/request_reply.md
diff --git a/developing-with-nats/intro-4/structure.md b/developing-with-nats/sending/structure.md
similarity index 100%
rename from developing-with-nats/intro-4/structure.md
rename to developing-with-nats/sending/structure.md
diff --git a/developing-with-nats/intro-6/README.md b/developing-with-nats/tutorials/README.md
similarity index 100%
rename from developing-with-nats/intro-6/README.md
rename to developing-with-nats/tutorials/README.md
diff --git a/developing-with-nats/intro-6/custom_dialer.md b/developing-with-nats/tutorials/custom_dialer.md
similarity index 100%
rename from developing-with-nats/intro-6/custom_dialer.md
rename to developing-with-nats/tutorials/custom_dialer.md
diff --git a/developing-with-nats/intro-6/pubsub.md b/developing-with-nats/tutorials/pubsub.md
similarity index 100%
rename from developing-with-nats/intro-6/pubsub.md
rename to developing-with-nats/tutorials/pubsub.md
diff --git a/developing-with-nats/intro-6/queues.md b/developing-with-nats/tutorials/queues.md
similarity index 100%
rename from developing-with-nats/intro-6/queues.md
rename to developing-with-nats/tutorials/queues.md
diff --git a/developing-with-nats/intro-6/reqreply.md b/developing-with-nats/tutorials/reqreply.md
similarity index 100%
rename from developing-with-nats/intro-6/reqreply.md
rename to developing-with-nats/tutorials/reqreply.md