diff --git a/advanced.rst b/advanced.rst
new file mode 100644
index 0000000..1230352
--- /dev/null
+++ b/advanced.rst
@@ -0,0 +1,12 @@
+Advanced Features Guide
+=======================
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+   :glob:
+
+   advanced/connectivity
+   advanced/upf
+   advanced/int
+   advanced/qos
diff --git a/advanced/connectivity.rst b/advanced/connectivity.rst
new file mode 100644
index 0000000..1221313
--- /dev/null
+++ b/advanced/connectivity.rst
@@ -0,0 +1,2 @@
+Advanced Connectivity
+=====================
diff --git a/advanced/int.rst b/advanced/int.rst
new file mode 100644
index 0000000..6f7cb02
--- /dev/null
+++ b/advanced/int.rst
@@ -0,0 +1,2 @@
+In-band Network Telemetry (INT)
+===============================
diff --git a/advanced/qos.rst b/advanced/qos.rst
new file mode 100644
index 0000000..4310e8e
--- /dev/null
+++ b/advanced/qos.rst
@@ -0,0 +1,2 @@
+QoS and Slicing
+===============
diff --git a/advanced/upf.rst b/advanced/upf.rst
new file mode 100644
index 0000000..72c9ae7
--- /dev/null
+++ b/advanced/upf.rst
@@ -0,0 +1,2 @@
+User Plane Function (UPF)
+=========================
diff --git a/architecture.rst b/architecture.rst
new file mode 100644
index 0000000..0b91706
--- /dev/null
+++ b/architecture.rst
@@ -0,0 +1,2 @@
+Architecture and Design
+=======================
diff --git a/community.rst b/community.rst
new file mode 100644
index 0000000..2e1b150
--- /dev/null
+++ b/community.rst
@@ -0,0 +1,2 @@
+Community
+=========
diff --git a/configuration.rst b/configuration.rst
new file mode 100644
index 0000000..d8b26ef
--- /dev/null
+++ b/configuration.rst
@@ -0,0 +1,11 @@
+Configuration Guide
+===================
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+   :glob:
+
+   configuration/network
+   configuration/component
+   configuration/chassis
diff --git a/configuration/chassis.rst b/configuration/chassis.rst
new file mode 100644
index 0000000..776321f
--- /dev/null
+++ b/configuration/chassis.rst
@@ -0,0 +1,2 @@
+Chassis Configuration
+=====================
diff --git a/configuration/component.rst b/configuration/component.rst
new file mode 100644
index 0000000..7f52ee0
--- /dev/null
+++ b/configuration/component.rst
@@ -0,0 +1,2 @@
+Component Configuration
+=======================
diff --git a/configuration/network.rst b/configuration/network.rst
new file mode 100644
index 0000000..6fc4c4e
--- /dev/null
+++ b/configuration/network.rst
@@ -0,0 +1,2 @@
+Network Configuration
+=====================
diff --git a/deployment.rst b/deployment.rst
new file mode 100644
index 0000000..4419e62
--- /dev/null
+++ b/deployment.rst
@@ -0,0 +1,2 @@
+Deployment Guide
+================
diff --git a/development.rst b/development.rst
new file mode 100644
index 0000000..a06f5ad
--- /dev/null
+++ b/development.rst
@@ -0,0 +1,2 @@
+Development Guide
+=================
diff --git a/dict.txt b/dict.txt
index e848b63..d992c3a 100644
--- a/dict.txt
+++ b/dict.txt
@@ -1,4 +1,5 @@
 ONF
+QoS
 SD-Fabric
 patchset
 reStructuredText
diff --git a/index.rst b/index.rst
index f9571ab..0434321 100644
--- a/index.rst
+++ b/index.rst
@@ -19,17 +19,35 @@
 
 .. toctree::
    :maxdepth: 2
+   :caption: Documentation
+   :hidden:
+   :glob:
+
+   specification
+   architecture
+   quickstart
+   deployment
+   configuration
+   advanced
+   operation
+   troubleshooting
+   development
+   testing
+
+.. toctree::
+   :maxdepth: 2
    :caption: Releases
    :hidden:
    :glob:
 
-   release/1*
    release/process.rst
+   release/1*
 
 .. toctree::
-   :maxdepth: 1
-   :caption: Meta
+   :maxdepth: 2
+   :caption: Misc
    :hidden:
    :glob:
 
+   community
    readme
diff --git a/operation.rst b/operation.rst
new file mode 100644
index 0000000..9789a9f
--- /dev/null
+++ b/operation.rst
@@ -0,0 +1,2 @@
+Operation Guide
+===============
diff --git a/quickstart.rst b/quickstart.rst
new file mode 100644
index 0000000..96162f1
--- /dev/null
+++ b/quickstart.rst
@@ -0,0 +1,2 @@
+Quick Start
+===========
diff --git a/release/1.0.rst b/release/1.0.rst
index 7b1a701..3d319ad 100644
--- a/release/1.0.rst
+++ b/release/1.0.rst
@@ -1,5 +1,5 @@
-SD-Fabric 1.0 Release
-=====================
+SD-Fabric 1.0
+=============
 
 Highlights
 ----------
diff --git a/specification.rst b/specification.rst
new file mode 100644
index 0000000..1da9c25
--- /dev/null
+++ b/specification.rst
@@ -0,0 +1,10 @@
+Specification
+=============
+
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+   :glob:
+
+   specification/hardware
+   specification/topology
diff --git a/specification/hardware.rst b/specification/hardware.rst
new file mode 100644
index 0000000..d152cf3
--- /dev/null
+++ b/specification/hardware.rst
@@ -0,0 +1,2 @@
+Supported Hardware
+==================
diff --git a/specification/topology.rst b/specification/topology.rst
new file mode 100644
index 0000000..5b5f96a
--- /dev/null
+++ b/specification/topology.rst
@@ -0,0 +1,2 @@
+Supported Topology
+==================
diff --git a/testing.rst b/testing.rst
new file mode 100644
index 0000000..15d1dc5
--- /dev/null
+++ b/testing.rst
@@ -0,0 +1,12 @@
+Testing Guide
+=============
+
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+   :glob:
+
+   testing/system
+   testing/component
+   testing/pipeline
diff --git a/testing/component.rst b/testing/component.rst
new file mode 100644
index 0000000..38673a0
--- /dev/null
+++ b/testing/component.rst
@@ -0,0 +1,2 @@
+Component Tests (STC)
+=====================
diff --git a/testing/pipeline.rst b/testing/pipeline.rst
new file mode 100644
index 0000000..d36f17e
--- /dev/null
+++ b/testing/pipeline.rst
@@ -0,0 +1,2 @@
+Pipeline Tests (PTF)
+====================
diff --git a/testing/system.rst b/testing/system.rst
new file mode 100644
index 0000000..419f4ce
--- /dev/null
+++ b/testing/system.rst
@@ -0,0 +1,2 @@
+System Integration Test (TestON)
+================================
diff --git a/troubleshooting.rst b/troubleshooting.rst
new file mode 100644
index 0000000..39c047d
--- /dev/null
+++ b/troubleshooting.rst
@@ -0,0 +1,2 @@
+Troubleshooting Guide
+=====================