diff --git a/doc/acl.md b/doc/acl.md
deleted file mode 100644
index cf0e88eb3..000000000
--- a/doc/acl.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# ACL
-
-## Protocol
-
-Authentication of users and devices
-
-Authorization of access to Server resources
-
-An implementation may restrict access to Server resources based on information provided by the Client such as User Name, Client Identifier, the hostname/IP address of the Client, or the outcome of authentication mechanisms.
-
-Identify a MQTT User: Peername, ClientId, Username
-
-
-## Access Rule
-
-allow | deny Who subscribe | publish Topic | all
-
-allow {clientid, {regexp, "abcd"}} subscribe "anna"
-deny  {clientid, "xxxx"} publish "#"
-allow {clientid, "abcd"} publish "#"
-allow {peername, "127.0.0.1"} subscribe "$SYS/#"
-allow {peername, "127.0.0.1"} subscribe all
-allow {clientid, "clientid"} subscribe  "#"
-allow {clientid, {regexp, "abcd"}} publish "anna"
-allow all subscribe all
-deny  all subscribe all
-allow all
-deny all
-
diff --git a/doc/broker.md b/doc/broker.md
deleted file mode 100644
index 08337cfdd..000000000
--- a/doc/broker.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Broker Topics
-
-## Version
-
-$SYS/broker/version
-
-## Uptime
-
-$SYS/broker/uptime
-
-## Recevied and Sent
-
-$SYS/broker/bytes/received
-$SYS/broker/bytes/sent
-
-$SYS/broker/packets/received
-$SYS/broker/packets/sent
-
-$SYS/broker/messages/received
-$SYS/broker/messages/sent
-$SYS/broker/messages/retained
-$SYS/broker/messages/stored
-$SYS/broker/messages/dropped
-
-## Client Presence
-
-$SYS/broker/clients/connected
-$SYS/broker/clients/disconnected
-
-$SYS/broker/clients/${clientId}/presences/online
-$SYS/broker/clients/${clientId}presences/offline
-
-
-
diff --git a/doc/cluster.md b/doc/cluster.md
deleted file mode 100644
index 076ba2689..000000000
--- a/doc/cluster.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-            zookeeper
-                |
-    eMQTT1  eMQTT2  eMQTT3
-
-
-Bridge
-
-
-    eMQTT1 --> eMQTT2
-
-
-Cluster
- 
-    eMQTT1 <--> eMQTT2
-
-
-Cluster and Bridge
-
-    eMQTT1      eMQTT3
-          ----> 
-    eMQTT2      eMQTT4
-
-Mnesia Cluster
-
diff --git a/doc/Architecture.png b/doc/design/Architecture.png
similarity index 100%
rename from doc/Architecture.png
rename to doc/design/Architecture.png
diff --git a/doc/Cluster.graphml b/doc/design/Design_Cluster.graphml
similarity index 100%
rename from doc/Cluster.graphml
rename to doc/design/Design_Cluster.graphml
diff --git a/doc/Cluster.png b/doc/design/Design_Cluster.png
similarity index 100%
rename from doc/Cluster.png
rename to doc/design/Design_Cluster.png
diff --git a/doc/Standalone.graphml b/doc/design/Design_Standalone.graphml
similarity index 100%
rename from doc/Standalone.graphml
rename to doc/design/Design_Standalone.graphml
diff --git a/doc/Standalone.png b/doc/design/Design_Standalone.png
similarity index 100%
rename from doc/Standalone.png
rename to doc/design/Design_Standalone.png
diff --git a/doc/design/PubSub_CleanSess_0.png b/doc/design/PubSub_CleanSess_0.png
new file mode 100644
index 000000000..831d25f8a
Binary files /dev/null and b/doc/design/PubSub_CleanSess_0.png differ
diff --git a/doc/design/PubSub_CleanSess_1.png b/doc/design/PubSub_CleanSess_1.png
new file mode 100644
index 000000000..bd6227e3a
Binary files /dev/null and b/doc/design/PubSub_CleanSess_1.png differ
diff --git a/doc/pubsub.md b/doc/pubsub.md
deleted file mode 100644
index 69fa14a91..000000000
--- a/doc/pubsub.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# PubSub
-
-## Qos 
-
-PubQos | SubQos | In Message | Out Message
--------|--------|------------|-------------
-   0   |   0    |   -        | - 
-   0   |   1    |   -        | - 
-   0   |   2    |   -        | - 
-   1   |   0    |   -        | - 
-   1   |   1    |   -        | - 
-   1   |   2    |   -        | - 
-   2   |   0    |   -        | - 
-   2   |   1    |   -        | - 
-   2   |   2    |   -        | - 
-
-
-## Publish
-
-
-## Performance
-
-Mac Air(11): 
-
-Function     | Time(microseconds)
--------------|--------------------
-match        | 6.25086
-triples      | 13.86881
-words        | 3.41177
-binary:split | 3.03776
-
-iMac:
-
-Function     | Time(microseconds)
--------------|--------------------
-match        | 3.2348
-triples      | 6.93524
-words        | 1.89616
-binary:split | 1.65243
-