diff --git a/api/identity-api-v3-os-endpoint-policy.rst b/api/v3/identity-api-v3-os-endpoint-policy.rst
similarity index 100%
rename from api/identity-api-v3-os-endpoint-policy.rst
rename to api/v3/identity-api-v3-os-endpoint-policy.rst
diff --git a/api/identity-api-v3-os-ep-filter-ext.rst b/api/v3/identity-api-v3-os-ep-filter-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-ep-filter-ext.rst
rename to api/v3/identity-api-v3-os-ep-filter-ext.rst
diff --git a/api/identity-api-v3-os-federation-ext.rst b/api/v3/identity-api-v3-os-federation-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-federation-ext.rst
rename to api/v3/identity-api-v3-os-federation-ext.rst
diff --git a/api/identity-api-v3-os-inherit-ext.rst b/api/v3/identity-api-v3-os-inherit-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-inherit-ext.rst
rename to api/v3/identity-api-v3-os-inherit-ext.rst
diff --git a/api/identity-api-v3-os-kds-ext.rst b/api/v3/identity-api-v3-os-kds-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-kds-ext.rst
rename to api/v3/identity-api-v3-os-kds-ext.rst
diff --git a/api/identity-api-v3-os-oauth1-ext.rst b/api/v3/identity-api-v3-os-oauth1-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-oauth1-ext.rst
rename to api/v3/identity-api-v3-os-oauth1-ext.rst
diff --git a/api/identity-api-v3-os-revoke-ext.rst b/api/v3/identity-api-v3-os-revoke-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-revoke-ext.rst
rename to api/v3/identity-api-v3-os-revoke-ext.rst
diff --git a/api/identity-api-v3-os-simple-certs-ext.rst b/api/v3/identity-api-v3-os-simple-certs-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-simple-certs-ext.rst
rename to api/v3/identity-api-v3-os-simple-certs-ext.rst
diff --git a/api/identity-api-v3-os-trust-ext.rst b/api/v3/identity-api-v3-os-trust-ext.rst
similarity index 100%
rename from api/identity-api-v3-os-trust-ext.rst
rename to api/v3/identity-api-v3-os-trust-ext.rst
diff --git a/api/identity-api-v3.rst b/api/v3/identity-api-v3.rst
similarity index 100%
rename from api/identity-api-v3.rst
rename to api/v3/identity-api-v3.rst
diff --git a/doc/source/index.rst b/doc/source/index.rst
index c606afe7..a1ce43b1 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,14 +1,28 @@
 .. identity-specs documentation master file
 
 ===============
-Identity V3 API
+Identity v3 API
 ===============
 
 .. toctree::
    :glob:
    :maxdepth: 1
 
-   api/*
+   api/v3/*
+
+.. NOTE(dhellmann): Uncomment this section after there is at least one
+   non-template spec for keystoneclient.
+
+    =================
+    Identity v2.0 API
+    =================
+
+    .. toctree::
+       :glob:
+       :maxdepth: 1
+
+       api/v2.0/*
+
 
 ================================
 Identity Program Specifications