diff --git a/quantum-api-1.0/common.ent b/v1.0/common.ent
similarity index 100%
rename from quantum-api-1.0/common.ent
rename to v1.0/common.ent
diff --git a/neutron-api-2.0/figures/Arrow_east.png b/v1.0/figures/Arrow_east.png
similarity index 100%
rename from neutron-api-2.0/figures/Arrow_east.png
rename to v1.0/figures/Arrow_east.png
diff --git a/neutron-api-2.0/figures/Arrow_east.svg b/v1.0/figures/Arrow_east.svg
similarity index 100%
rename from neutron-api-2.0/figures/Arrow_east.svg
rename to v1.0/figures/Arrow_east.svg
diff --git a/neutron-api-2.0/figures/Check_mark_23x20_02.png b/v1.0/figures/Check_mark_23x20_02.png
similarity index 100%
rename from neutron-api-2.0/figures/Check_mark_23x20_02.png
rename to v1.0/figures/Check_mark_23x20_02.png
diff --git a/neutron-api-2.0/figures/Check_mark_23x20_02.svg b/v1.0/figures/Check_mark_23x20_02.svg
similarity index 100%
rename from neutron-api-2.0/figures/Check_mark_23x20_02.svg
rename to v1.0/figures/Check_mark_23x20_02.svg
diff --git a/neutron-api-2.0/js/shjs/sh_java.js b/v1.0/js/shjs/sh_java.js
similarity index 100%
rename from neutron-api-2.0/js/shjs/sh_java.js
rename to v1.0/js/shjs/sh_java.js
diff --git a/neutron-api-2.0/js/shjs/sh_javascript.js b/v1.0/js/shjs/sh_javascript.js
similarity index 100%
rename from neutron-api-2.0/js/shjs/sh_javascript.js
rename to v1.0/js/shjs/sh_javascript.js
diff --git a/neutron-api-2.0/js/shjs/sh_main.js b/v1.0/js/shjs/sh_main.js
similarity index 100%
rename from neutron-api-2.0/js/shjs/sh_main.js
rename to v1.0/js/shjs/sh_main.js
diff --git a/neutron-api-2.0/js/shjs/sh_xml.js b/v1.0/js/shjs/sh_xml.js
similarity index 100%
rename from neutron-api-2.0/js/shjs/sh_xml.js
rename to v1.0/js/shjs/sh_xml.js
diff --git a/neutron-api-2.0/js/trc/schema/controller.js b/v1.0/js/trc/schema/controller.js
similarity index 100%
rename from neutron-api-2.0/js/trc/schema/controller.js
rename to v1.0/js/trc/schema/controller.js
diff --git a/neutron-api-2.0/js/trc/schema/layoutManager.js b/v1.0/js/trc/schema/layoutManager.js
similarity index 100%
rename from neutron-api-2.0/js/trc/schema/layoutManager.js
rename to v1.0/js/trc/schema/layoutManager.js
diff --git a/neutron-api-2.0/js/trc/schema/sampleManager.js b/v1.0/js/trc/schema/sampleManager.js
similarity index 100%
rename from neutron-api-2.0/js/trc/schema/sampleManager.js
rename to v1.0/js/trc/schema/sampleManager.js
diff --git a/neutron-api-2.0/js/trc/util.js b/v1.0/js/trc/util.js
similarity index 100%
rename from neutron-api-2.0/js/trc/util.js
rename to v1.0/js/trc/util.js
diff --git a/quantum-api-1.0/quantum-api-guide.xml b/v1.0/neutron-api-guide.xml
similarity index 100%
rename from quantum-api-1.0/quantum-api-guide.xml
rename to v1.0/neutron-api-guide.xml
diff --git a/quantum-api-1.0/pom.xml b/v1.0/pom.xml
similarity index 91%
rename from quantum-api-1.0/pom.xml
rename to v1.0/pom.xml
index 025b19a..c8659bf 100644
--- a/quantum-api-1.0/pom.xml
+++ b/v1.0/pom.xml
@@ -3,10 +3,10 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openstack.docs</groupId>
-    <artifactId>openstack-api-reference</artifactId>
+    <artifactId>openstack-network-api-v1</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack API Reference</name>
+    <name>OpenStack Networking API v1.0 Reference</name>
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
         <release.path.name>local</release.path.name>
@@ -22,7 +22,7 @@
                 <artifactId>clouddocs-maven-plugin</artifactId>
                 <version>1.11.0</version>
                 <executions>
-                    <!-- Configuration for OpenStack End User Guide -->
+                    <!-- Configuration for OpenStack Networking API Reference -->
                     <execution>
                         <id>goal1</id>
                         <goals>
@@ -30,7 +30,7 @@
                         </goals>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <includes> quantum-api-guide.xml</includes>
+                            <includes> neutron-api-guide.xml</includes>
                             <generateToc>
                                 appendix toc
                                 article/appendix nop
@@ -64,7 +64,7 @@
                     <security>external</security>
                     <branding>openstack</branding>
                     <enableDisqus>1</enableDisqus>
-                    <disqusShortname>os-quantum-guides</disqusShortname>
+                    <disqusShortname>os-neutron-guides</disqusShortname>
                     <enableGoogleAnalytics>1</enableGoogleAnalytics>
                     <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
                     <suppressFooterNavigation>0</suppressFooterNavigation>
diff --git a/neutron-api-2.0/samples/att-get-res-none.json b/v1.0/samples/att-get-res-none.json
similarity index 100%
rename from neutron-api-2.0/samples/att-get-res-none.json
rename to v1.0/samples/att-get-res-none.json
diff --git a/neutron-api-2.0/samples/att-get-res-none.xml b/v1.0/samples/att-get-res-none.xml
similarity index 100%
rename from neutron-api-2.0/samples/att-get-res-none.xml
rename to v1.0/samples/att-get-res-none.xml
diff --git a/neutron-api-2.0/samples/att-get-res.json b/v1.0/samples/att-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/att-get-res.json
rename to v1.0/samples/att-get-res.json
diff --git a/neutron-api-2.0/samples/att-get-res.xml b/v1.0/samples/att-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/att-get-res.xml
rename to v1.0/samples/att-get-res.xml
diff --git a/neutron-api-2.0/samples/att-put-req.json b/v1.0/samples/att-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/att-put-req.json
rename to v1.0/samples/att-put-req.json
diff --git a/neutron-api-2.0/samples/att-put-req.xml b/v1.0/samples/att-put-req.xml
similarity index 100%
rename from neutron-api-2.0/samples/att-put-req.xml
rename to v1.0/samples/att-put-req.xml
diff --git a/neutron-api-2.0/samples/extensions.json b/v1.0/samples/extensions.json
similarity index 100%
rename from neutron-api-2.0/samples/extensions.json
rename to v1.0/samples/extensions.json
diff --git a/quantum-api-1.0/samples/extensions.xml b/v1.0/samples/extensions.xml
similarity index 100%
rename from quantum-api-1.0/samples/extensions.xml
rename to v1.0/samples/extensions.xml
diff --git a/neutron-api-2.0/samples/fault.json b/v1.0/samples/fault.json
similarity index 100%
rename from neutron-api-2.0/samples/fault.json
rename to v1.0/samples/fault.json
diff --git a/neutron-api-2.0/samples/fault.xml b/v1.0/samples/fault.xml
similarity index 100%
rename from neutron-api-2.0/samples/fault.xml
rename to v1.0/samples/fault.xml
diff --git a/neutron-api-2.0/samples/network-get-detail-res.json b/v1.0/samples/network-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/network-get-detail-res.json
rename to v1.0/samples/network-get-detail-res.json
diff --git a/neutron-api-2.0/samples/network-get-detail-res.xml b/v1.0/samples/network-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/network-get-detail-res.xml
rename to v1.0/samples/network-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/network-get-res.json b/v1.0/samples/network-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/network-get-res.json
rename to v1.0/samples/network-get-res.json
diff --git a/neutron-api-2.0/samples/network-get-res.xml b/v1.0/samples/network-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/network-get-res.xml
rename to v1.0/samples/network-get-res.xml
diff --git a/quantum-api-1.0/samples/network-post-req.json b/v1.0/samples/network-post-req.json
similarity index 100%
rename from quantum-api-1.0/samples/network-post-req.json
rename to v1.0/samples/network-post-req.json
diff --git a/neutron-api-2.0/samples/network-post-req.xml b/v1.0/samples/network-post-req.xml
similarity index 100%
rename from neutron-api-2.0/samples/network-post-req.xml
rename to v1.0/samples/network-post-req.xml
diff --git a/quantum-api-1.0/samples/network-post-res.json b/v1.0/samples/network-post-res.json
similarity index 100%
rename from quantum-api-1.0/samples/network-post-res.json
rename to v1.0/samples/network-post-res.json
diff --git a/neutron-api-2.0/samples/network-post-res.xml b/v1.0/samples/network-post-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/network-post-res.xml
rename to v1.0/samples/network-post-res.xml
diff --git a/quantum-api-1.0/samples/networks-get-detail-res.json b/v1.0/samples/networks-get-detail-res.json
similarity index 100%
rename from quantum-api-1.0/samples/networks-get-detail-res.json
rename to v1.0/samples/networks-get-detail-res.json
diff --git a/neutron-api-2.0/samples/networks-get-detail-res.xml b/v1.0/samples/networks-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-detail-res.xml
rename to v1.0/samples/networks-get-detail-res.xml
diff --git a/quantum-api-1.0/samples/networks-get-res.json b/v1.0/samples/networks-get-res.json
similarity index 100%
rename from quantum-api-1.0/samples/networks-get-res.json
rename to v1.0/samples/networks-get-res.json
diff --git a/neutron-api-2.0/samples/networks-get-res.xml b/v1.0/samples/networks-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-res.xml
rename to v1.0/samples/networks-get-res.xml
diff --git a/quantum-api-1.0/samples/networks-post-req.json b/v1.0/samples/networks-post-req.json
similarity index 100%
rename from quantum-api-1.0/samples/networks-post-req.json
rename to v1.0/samples/networks-post-req.json
diff --git a/neutron-api-2.0/samples/networks-post-req.xml b/v1.0/samples/networks-post-req.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-req.xml
rename to v1.0/samples/networks-post-req.xml
diff --git a/quantum-api-1.0/samples/networks-post-res.json b/v1.0/samples/networks-post-res.json
similarity index 100%
rename from quantum-api-1.0/samples/networks-post-res.json
rename to v1.0/samples/networks-post-res.json
diff --git a/neutron-api-2.0/samples/networks-post-res.xml b/v1.0/samples/networks-post-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-res.xml
rename to v1.0/samples/networks-post-res.xml
diff --git a/neutron-api-2.0/samples/notfound.json b/v1.0/samples/notfound.json
similarity index 100%
rename from neutron-api-2.0/samples/notfound.json
rename to v1.0/samples/notfound.json
diff --git a/neutron-api-2.0/samples/notfound.xml b/v1.0/samples/notfound.xml
similarity index 100%
rename from neutron-api-2.0/samples/notfound.xml
rename to v1.0/samples/notfound.xml
diff --git a/neutron-api-2.0/samples/notimplemented.json b/v1.0/samples/notimplemented.json
similarity index 100%
rename from neutron-api-2.0/samples/notimplemented.json
rename to v1.0/samples/notimplemented.json
diff --git a/neutron-api-2.0/samples/notimplemented.xml b/v1.0/samples/notimplemented.xml
similarity index 100%
rename from neutron-api-2.0/samples/notimplemented.xml
rename to v1.0/samples/notimplemented.xml
diff --git a/neutron-api-2.0/samples/port-get-detail-res.json b/v1.0/samples/port-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/port-get-detail-res.json
rename to v1.0/samples/port-get-detail-res.json
diff --git a/neutron-api-2.0/samples/port-get-detail-res.xml b/v1.0/samples/port-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/port-get-detail-res.xml
rename to v1.0/samples/port-get-detail-res.xml
diff --git a/quantum-api-1.0/samples/port-get-res.json b/v1.0/samples/port-get-res.json
similarity index 100%
rename from quantum-api-1.0/samples/port-get-res.json
rename to v1.0/samples/port-get-res.json
diff --git a/neutron-api-2.0/samples/port-get-res.xml b/v1.0/samples/port-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/port-get-res.xml
rename to v1.0/samples/port-get-res.xml
diff --git a/quantum-api-1.0/samples/port-post-req.json b/v1.0/samples/port-post-req.json
similarity index 100%
rename from quantum-api-1.0/samples/port-post-req.json
rename to v1.0/samples/port-post-req.json
diff --git a/neutron-api-2.0/samples/port-post-req.xml b/v1.0/samples/port-post-req.xml
similarity index 100%
rename from neutron-api-2.0/samples/port-post-req.xml
rename to v1.0/samples/port-post-req.xml
diff --git a/quantum-api-1.0/samples/port-post-res.json b/v1.0/samples/port-post-res.json
similarity index 100%
rename from quantum-api-1.0/samples/port-post-res.json
rename to v1.0/samples/port-post-res.json
diff --git a/neutron-api-2.0/samples/port-post-res.xml b/v1.0/samples/port-post-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/port-post-res.xml
rename to v1.0/samples/port-post-res.xml
diff --git a/neutron-api-2.0/samples/ports-get-detail-res.json b/v1.0/samples/ports-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-detail-res.json
rename to v1.0/samples/ports-get-detail-res.json
diff --git a/neutron-api-2.0/samples/ports-get-detail-res.xml b/v1.0/samples/ports-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-detail-res.xml
rename to v1.0/samples/ports-get-detail-res.xml
diff --git a/quantum-api-1.0/samples/ports-get-res.json b/v1.0/samples/ports-get-res.json
similarity index 100%
rename from quantum-api-1.0/samples/ports-get-res.json
rename to v1.0/samples/ports-get-res.json
diff --git a/neutron-api-2.0/samples/ports-get-res.xml b/v1.0/samples/ports-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-res.xml
rename to v1.0/samples/ports-get-res.xml
diff --git a/neutron-api-2.0/samples/private.json b/v1.0/samples/private.json
similarity index 100%
rename from neutron-api-2.0/samples/private.json
rename to v1.0/samples/private.json
diff --git a/neutron-api-2.0/samples/private.xml b/v1.0/samples/private.xml
similarity index 100%
rename from neutron-api-2.0/samples/private.xml
rename to v1.0/samples/private.xml
diff --git a/neutron-api-2.0/samples/public.json b/v1.0/samples/public.json
similarity index 100%
rename from neutron-api-2.0/samples/public.json
rename to v1.0/samples/public.json
diff --git a/neutron-api-2.0/samples/public.xml b/v1.0/samples/public.xml
similarity index 100%
rename from neutron-api-2.0/samples/public.xml
rename to v1.0/samples/public.xml
diff --git a/neutron-api-2.0/samples/versions-atom.xml b/v1.0/samples/versions-atom.xml
similarity index 100%
rename from neutron-api-2.0/samples/versions-atom.xml
rename to v1.0/samples/versions-atom.xml
diff --git a/neutron-api-2.0/samples/versions.json b/v1.0/samples/versions.json
similarity index 100%
rename from neutron-api-2.0/samples/versions.json
rename to v1.0/samples/versions.json
diff --git a/neutron-api-2.0/samples/versions.xml b/v1.0/samples/versions.xml
similarity index 100%
rename from neutron-api-2.0/samples/versions.xml
rename to v1.0/samples/versions.xml
diff --git a/neutron-api-2.0/style/schema.css b/v1.0/style/schema.css
similarity index 100%
rename from neutron-api-2.0/style/schema.css
rename to v1.0/style/schema.css
diff --git a/neutron-api-2.0/style/shjs/sh_acid.css b/v1.0/style/shjs/sh_acid.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_acid.css
rename to v1.0/style/shjs/sh_acid.css
diff --git a/neutron-api-2.0/style/shjs/sh_darkblue.css b/v1.0/style/shjs/sh_darkblue.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_darkblue.css
rename to v1.0/style/shjs/sh_darkblue.css
diff --git a/neutron-api-2.0/style/shjs/sh_emacs.css b/v1.0/style/shjs/sh_emacs.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_emacs.css
rename to v1.0/style/shjs/sh_emacs.css
diff --git a/neutron-api-2.0/style/shjs/sh_night.css b/v1.0/style/shjs/sh_night.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_night.css
rename to v1.0/style/shjs/sh_night.css
diff --git a/neutron-api-2.0/style/shjs/sh_pablo.css b/v1.0/style/shjs/sh_pablo.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_pablo.css
rename to v1.0/style/shjs/sh_pablo.css
diff --git a/neutron-api-2.0/style/shjs/sh_print.css b/v1.0/style/shjs/sh_print.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_print.css
rename to v1.0/style/shjs/sh_print.css
diff --git a/neutron-api-2.0/style/shjs/sh_style.css b/v1.0/style/shjs/sh_style.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_style.css
rename to v1.0/style/shjs/sh_style.css
diff --git a/neutron-api-2.0/style/shjs/sh_whitengrey.css b/v1.0/style/shjs/sh_whitengrey.css
similarity index 100%
rename from neutron-api-2.0/style/shjs/sh_whitengrey.css
rename to v1.0/style/shjs/sh_whitengrey.css
diff --git a/neutron-api-2.0/xsd/.htaccess b/v1.0/xsd/.htaccess
similarity index 100%
rename from neutron-api-2.0/xsd/.htaccess
rename to v1.0/xsd/.htaccess
diff --git a/neutron-api-2.0/xsd/actions.xsd b/v1.0/xsd/actions.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/actions.xsd
rename to v1.0/xsd/actions.xsd
diff --git a/neutron-api-2.0/xsd/affinity-id.xjb b/v1.0/xsd/affinity-id.xjb
similarity index 100%
rename from neutron-api-2.0/xsd/affinity-id.xjb
rename to v1.0/xsd/affinity-id.xjb
diff --git a/neutron-api-2.0/xsd/affinity-id.xsd b/v1.0/xsd/affinity-id.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/affinity-id.xsd
rename to v1.0/xsd/affinity-id.xsd
diff --git a/neutron-api-2.0/xsd/api-common.xjb b/v1.0/xsd/api-common.xjb
similarity index 100%
rename from neutron-api-2.0/xsd/api-common.xjb
rename to v1.0/xsd/api-common.xjb
diff --git a/neutron-api-2.0/xsd/api-common.xsd b/v1.0/xsd/api-common.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/api-common.xsd
rename to v1.0/xsd/api-common.xsd
diff --git a/neutron-api-2.0/xsd/api.xjb b/v1.0/xsd/api.xjb
similarity index 100%
rename from neutron-api-2.0/xsd/api.xjb
rename to v1.0/xsd/api.xjb
diff --git a/neutron-api-2.0/xsd/api.xsd b/v1.0/xsd/api.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/api.xsd
rename to v1.0/xsd/api.xsd
diff --git a/neutron-api-2.0/xsd/atom.xjb b/v1.0/xsd/atom.xjb
similarity index 100%
rename from neutron-api-2.0/xsd/atom.xjb
rename to v1.0/xsd/atom.xjb
diff --git a/neutron-api-2.0/xsd/atom/atom.xsd b/v1.0/xsd/atom/atom.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/atom/atom.xsd
rename to v1.0/xsd/atom/atom.xsd
diff --git a/neutron-api-2.0/xsd/atom/xml.xsd b/v1.0/xsd/atom/xml.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/atom/xml.xsd
rename to v1.0/xsd/atom/xml.xsd
diff --git a/neutron-api-2.0/xsd/backup.xsd b/v1.0/xsd/backup.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/backup.xsd
rename to v1.0/xsd/backup.xsd
diff --git a/neutron-api-2.0/xsd/common.xsd b/v1.0/xsd/common.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/common.xsd
rename to v1.0/xsd/common.xsd
diff --git a/neutron-api-2.0/xsd/ext/rax-dme/api.xsd b/v1.0/xsd/ext/rax-dme/api.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/ext/rax-dme/api.xsd
rename to v1.0/xsd/ext/rax-dme/api.xsd
diff --git a/neutron-api-2.0/xsd/ext/rax-dme/rax-dme.xsd b/v1.0/xsd/ext/rax-dme/rax-dme.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/ext/rax-dme/rax-dme.xsd
rename to v1.0/xsd/ext/rax-dme/rax-dme.xsd
diff --git a/neutron-api-2.0/xsd/extensions.xsd b/v1.0/xsd/extensions.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/extensions.xsd
rename to v1.0/xsd/extensions.xsd
diff --git a/neutron-api-2.0/xsd/faults.xsd b/v1.0/xsd/faults.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/faults.xsd
rename to v1.0/xsd/faults.xsd
diff --git a/neutron-api-2.0/xsd/flavor.xsd b/v1.0/xsd/flavor.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/flavor.xsd
rename to v1.0/xsd/flavor.xsd
diff --git a/neutron-api-2.0/xsd/image.xsd b/v1.0/xsd/image.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/image.xsd
rename to v1.0/xsd/image.xsd
diff --git a/neutron-api-2.0/xsd/ipgroup.xsd b/v1.0/xsd/ipgroup.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/ipgroup.xsd
rename to v1.0/xsd/ipgroup.xsd
diff --git a/neutron-api-2.0/xsd/limits.xsd b/v1.0/xsd/limits.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/limits.xsd
rename to v1.0/xsd/limits.xsd
diff --git a/neutron-api-2.0/xsd/metadata.xsd b/v1.0/xsd/metadata.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/metadata.xsd
rename to v1.0/xsd/metadata.xsd
diff --git a/neutron-api-2.0/xsd/server.xsd b/v1.0/xsd/server.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/server.xsd
rename to v1.0/xsd/server.xsd
diff --git a/neutron-api-2.0/xsd/shareip.xjb b/v1.0/xsd/shareip.xjb
similarity index 100%
rename from neutron-api-2.0/xsd/shareip.xjb
rename to v1.0/xsd/shareip.xjb
diff --git a/neutron-api-2.0/xsd/shareip.xsd b/v1.0/xsd/shareip.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/shareip.xsd
rename to v1.0/xsd/shareip.xsd
diff --git a/neutron-api-2.0/xsd/txt.htaccess b/v1.0/xsd/txt.htaccess
similarity index 100%
rename from neutron-api-2.0/xsd/txt.htaccess
rename to v1.0/xsd/txt.htaccess
diff --git a/neutron-api-2.0/xsd/version.xsd b/v1.0/xsd/version.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/version.xsd
rename to v1.0/xsd/version.xsd
diff --git a/neutron-api-2.0/xslt/schema.xsl b/v1.0/xslt/schema.xsl
similarity index 100%
rename from neutron-api-2.0/xslt/schema.xsl
rename to v1.0/xslt/schema.xsl
diff --git a/neutron-api-2.0/ch_preface.xml b/v2.0/ch_preface.xml
similarity index 100%
rename from neutron-api-2.0/ch_preface.xml
rename to v2.0/ch_preface.xml
diff --git a/neutron-api-2.0/common.ent b/v2.0/common.ent
similarity index 100%
rename from neutron-api-2.0/common.ent
rename to v2.0/common.ent
diff --git a/quantum-api-1.0/figures/Arrow_east.png b/v2.0/figures/Arrow_east.png
similarity index 100%
rename from quantum-api-1.0/figures/Arrow_east.png
rename to v2.0/figures/Arrow_east.png
diff --git a/quantum-api-1.0/figures/Arrow_east.svg b/v2.0/figures/Arrow_east.svg
similarity index 100%
rename from quantum-api-1.0/figures/Arrow_east.svg
rename to v2.0/figures/Arrow_east.svg
diff --git a/quantum-api-1.0/figures/Check_mark_23x20_02.png b/v2.0/figures/Check_mark_23x20_02.png
similarity index 100%
rename from quantum-api-1.0/figures/Check_mark_23x20_02.png
rename to v2.0/figures/Check_mark_23x20_02.png
diff --git a/quantum-api-1.0/figures/Check_mark_23x20_02.svg b/v2.0/figures/Check_mark_23x20_02.svg
similarity index 100%
rename from quantum-api-1.0/figures/Check_mark_23x20_02.svg
rename to v2.0/figures/Check_mark_23x20_02.svg
diff --git a/quantum-api-1.0/js/shjs/sh_java.js b/v2.0/js/shjs/sh_java.js
similarity index 100%
rename from quantum-api-1.0/js/shjs/sh_java.js
rename to v2.0/js/shjs/sh_java.js
diff --git a/quantum-api-1.0/js/shjs/sh_javascript.js b/v2.0/js/shjs/sh_javascript.js
similarity index 100%
rename from quantum-api-1.0/js/shjs/sh_javascript.js
rename to v2.0/js/shjs/sh_javascript.js
diff --git a/quantum-api-1.0/js/shjs/sh_main.js b/v2.0/js/shjs/sh_main.js
similarity index 100%
rename from quantum-api-1.0/js/shjs/sh_main.js
rename to v2.0/js/shjs/sh_main.js
diff --git a/quantum-api-1.0/js/shjs/sh_xml.js b/v2.0/js/shjs/sh_xml.js
similarity index 100%
rename from quantum-api-1.0/js/shjs/sh_xml.js
rename to v2.0/js/shjs/sh_xml.js
diff --git a/quantum-api-1.0/js/trc/schema/controller.js b/v2.0/js/trc/schema/controller.js
similarity index 100%
rename from quantum-api-1.0/js/trc/schema/controller.js
rename to v2.0/js/trc/schema/controller.js
diff --git a/quantum-api-1.0/js/trc/schema/layoutManager.js b/v2.0/js/trc/schema/layoutManager.js
similarity index 100%
rename from quantum-api-1.0/js/trc/schema/layoutManager.js
rename to v2.0/js/trc/schema/layoutManager.js
diff --git a/quantum-api-1.0/js/trc/schema/sampleManager.js b/v2.0/js/trc/schema/sampleManager.js
similarity index 100%
rename from quantum-api-1.0/js/trc/schema/sampleManager.js
rename to v2.0/js/trc/schema/sampleManager.js
diff --git a/quantum-api-1.0/js/trc/util.js b/v2.0/js/trc/util.js
similarity index 100%
rename from quantum-api-1.0/js/trc/util.js
rename to v2.0/js/trc/util.js
diff --git a/neutron-api-2.0/neutron-agent-ext.xml b/v2.0/neutron-agent-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-agent-ext.xml
rename to v2.0/neutron-agent-ext.xml
diff --git a/neutron-api-2.0/neutron-allowed-address-pair-ext.xml b/v2.0/neutron-allowed-address-pair-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-allowed-address-pair-ext.xml
rename to v2.0/neutron-allowed-address-pair-ext.xml
diff --git a/neutron-api-2.0/neutron-api-guide.xml b/v2.0/neutron-api-guide.xml
similarity index 100%
rename from neutron-api-2.0/neutron-api-guide.xml
rename to v2.0/neutron-api-guide.xml
diff --git a/neutron-api-2.0/neutron-extra-dhcp-opt-ext.xml b/v2.0/neutron-extra-dhcp-opt-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-extra-dhcp-opt-ext.xml
rename to v2.0/neutron-extra-dhcp-opt-ext.xml
diff --git a/neutron-api-2.0/neutron-extraroute-ext.xml b/v2.0/neutron-extraroute-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-extraroute-ext.xml
rename to v2.0/neutron-extraroute-ext.xml
diff --git a/neutron-api-2.0/neutron-l3-ext.xml b/v2.0/neutron-l3-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-l3-ext.xml
rename to v2.0/neutron-l3-ext.xml
diff --git a/neutron-api-2.0/neutron-loadbalancer-ext.xml b/v2.0/neutron-loadbalancer-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-loadbalancer-ext.xml
rename to v2.0/neutron-loadbalancer-ext.xml
diff --git a/neutron-api-2.0/neutron-provider-ext.xml b/v2.0/neutron-provider-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-provider-ext.xml
rename to v2.0/neutron-provider-ext.xml
diff --git a/neutron-api-2.0/neutron-quotas-ext.xml b/v2.0/neutron-quotas-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-quotas-ext.xml
rename to v2.0/neutron-quotas-ext.xml
diff --git a/neutron-api-2.0/neutron-scheduler-ext.xml b/v2.0/neutron-scheduler-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-scheduler-ext.xml
rename to v2.0/neutron-scheduler-ext.xml
diff --git a/neutron-api-2.0/neutron-security-groups-ext.xml b/v2.0/neutron-security-groups-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-security-groups-ext.xml
rename to v2.0/neutron-security-groups-ext.xml
diff --git a/neutron-api-2.0/neutron-vpn-ext.xml b/v2.0/neutron-vpn-ext.xml
similarity index 100%
rename from neutron-api-2.0/neutron-vpn-ext.xml
rename to v2.0/neutron-vpn-ext.xml
diff --git a/neutron-api-2.0/pom.xml b/v2.0/pom.xml
similarity index 95%
rename from neutron-api-2.0/pom.xml
rename to v2.0/pom.xml
index 955dffb..c62ea97 100644
--- a/neutron-api-2.0/pom.xml
+++ b/v2.0/pom.xml
@@ -3,10 +3,10 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openstack.docs</groupId>
-    <artifactId>openstack-api-reference</artifactId>
+    <artifactId>openstack-network-api-v2</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>OpenStack API Reference</name>
+    <name>OpenStack Networking API v2.0 Reference</name>
     <properties>
         <!-- This is set by Jenkins according to the branch. -->
         <release.path.name>local</release.path.name>
diff --git a/neutron-api-2.0/samples/agents-delete-res.json b/v2.0/samples/agents-delete-res.json
similarity index 100%
rename from neutron-api-2.0/samples/agents-delete-res.json
rename to v2.0/samples/agents-delete-res.json
diff --git a/neutron-api-2.0/samples/agents-list-res.json b/v2.0/samples/agents-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/agents-list-res.json
rename to v2.0/samples/agents-list-res.json
diff --git a/neutron-api-2.0/samples/agents-put-req.json b/v2.0/samples/agents-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/agents-put-req.json
rename to v2.0/samples/agents-put-req.json
diff --git a/neutron-api-2.0/samples/agents-put-res.json b/v2.0/samples/agents-put-res.json
similarity index 100%
rename from neutron-api-2.0/samples/agents-put-res.json
rename to v2.0/samples/agents-put-res.json
diff --git a/neutron-api-2.0/samples/agents-show-res.json b/v2.0/samples/agents-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/agents-show-res.json
rename to v2.0/samples/agents-show-res.json
diff --git a/quantum-api-1.0/samples/att-get-res-none.json b/v2.0/samples/att-get-res-none.json
similarity index 100%
rename from quantum-api-1.0/samples/att-get-res-none.json
rename to v2.0/samples/att-get-res-none.json
diff --git a/quantum-api-1.0/samples/att-get-res-none.xml b/v2.0/samples/att-get-res-none.xml
similarity index 100%
rename from quantum-api-1.0/samples/att-get-res-none.xml
rename to v2.0/samples/att-get-res-none.xml
diff --git a/quantum-api-1.0/samples/att-get-res.json b/v2.0/samples/att-get-res.json
similarity index 100%
rename from quantum-api-1.0/samples/att-get-res.json
rename to v2.0/samples/att-get-res.json
diff --git a/quantum-api-1.0/samples/att-get-res.xml b/v2.0/samples/att-get-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/att-get-res.xml
rename to v2.0/samples/att-get-res.xml
diff --git a/quantum-api-1.0/samples/att-put-req.json b/v2.0/samples/att-put-req.json
similarity index 100%
rename from quantum-api-1.0/samples/att-put-req.json
rename to v2.0/samples/att-put-req.json
diff --git a/quantum-api-1.0/samples/att-put-req.xml b/v2.0/samples/att-put-req.xml
similarity index 100%
rename from quantum-api-1.0/samples/att-put-req.xml
rename to v2.0/samples/att-put-req.xml
diff --git a/neutron-api-2.0/samples/extension.xml b/v2.0/samples/extension.xml
similarity index 100%
rename from neutron-api-2.0/samples/extension.xml
rename to v2.0/samples/extension.xml
diff --git a/quantum-api-1.0/samples/extensions.json b/v2.0/samples/extensions.json
similarity index 100%
rename from quantum-api-1.0/samples/extensions.json
rename to v2.0/samples/extensions.json
diff --git a/neutron-api-2.0/samples/extensions.xml b/v2.0/samples/extensions.xml
similarity index 100%
rename from neutron-api-2.0/samples/extensions.xml
rename to v2.0/samples/extensions.xml
diff --git a/neutron-api-2.0/samples/extensionsv2.xml b/v2.0/samples/extensionsv2.xml
similarity index 100%
rename from neutron-api-2.0/samples/extensionsv2.xml
rename to v2.0/samples/extensionsv2.xml
diff --git a/neutron-api-2.0/samples/extraroute-put-req.json b/v2.0/samples/extraroute-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/extraroute-put-req.json
rename to v2.0/samples/extraroute-put-req.json
diff --git a/neutron-api-2.0/samples/extraroute-put-res.json b/v2.0/samples/extraroute-put-res.json
similarity index 100%
rename from neutron-api-2.0/samples/extraroute-put-res.json
rename to v2.0/samples/extraroute-put-res.json
diff --git a/quantum-api-1.0/samples/fault.json b/v2.0/samples/fault.json
similarity index 100%
rename from quantum-api-1.0/samples/fault.json
rename to v2.0/samples/fault.json
diff --git a/quantum-api-1.0/samples/fault.xml b/v2.0/samples/fault.xml
similarity index 100%
rename from quantum-api-1.0/samples/fault.xml
rename to v2.0/samples/fault.xml
diff --git a/neutron-api-2.0/samples/floatingips-get-res.json b/v2.0/samples/floatingips-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-get-res.json
rename to v2.0/samples/floatingips-get-res.json
diff --git a/neutron-api-2.0/samples/floatingips-post-req.json b/v2.0/samples/floatingips-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-post-req.json
rename to v2.0/samples/floatingips-post-req.json
diff --git a/neutron-api-2.0/samples/floatingips-post-res.json b/v2.0/samples/floatingips-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-post-res.json
rename to v2.0/samples/floatingips-post-res.json
diff --git a/neutron-api-2.0/samples/floatingips-put-ass-req.json b/v2.0/samples/floatingips-put-ass-req.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-put-ass-req.json
rename to v2.0/samples/floatingips-put-ass-req.json
diff --git a/neutron-api-2.0/samples/floatingips-put-ass-res.json b/v2.0/samples/floatingips-put-ass-res.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-put-ass-res.json
rename to v2.0/samples/floatingips-put-ass-res.json
diff --git a/neutron-api-2.0/samples/floatingips-put-disass-req.json b/v2.0/samples/floatingips-put-disass-req.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-put-disass-req.json
rename to v2.0/samples/floatingips-put-disass-req.json
diff --git a/neutron-api-2.0/samples/floatingips-put-disass-res.json b/v2.0/samples/floatingips-put-disass-res.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-put-disass-res.json
rename to v2.0/samples/floatingips-put-disass-res.json
diff --git a/neutron-api-2.0/samples/floatingips-show-res.json b/v2.0/samples/floatingips-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/floatingips-show-res.json
rename to v2.0/samples/floatingips-show-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-create-req.json b/v2.0/samples/loadbalancer/health_monitors-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-create-req.json
rename to v2.0/samples/loadbalancer/health_monitors-create-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-create-res.json b/v2.0/samples/loadbalancer/health_monitors-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-create-res.json
rename to v2.0/samples/loadbalancer/health_monitors-create-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-list-res.json b/v2.0/samples/loadbalancer/health_monitors-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-list-res.json
rename to v2.0/samples/loadbalancer/health_monitors-list-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-show-res.json b/v2.0/samples/loadbalancer/health_monitors-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-show-res.json
rename to v2.0/samples/loadbalancer/health_monitors-show-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-update-req.json b/v2.0/samples/loadbalancer/health_monitors-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-update-req.json
rename to v2.0/samples/loadbalancer/health_monitors-update-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/health_monitors-update-res.json b/v2.0/samples/loadbalancer/health_monitors-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/health_monitors-update-res.json
rename to v2.0/samples/loadbalancer/health_monitors-update-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/healthmonitors-associate-req.json b/v2.0/samples/loadbalancer/healthmonitors-associate-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/healthmonitors-associate-req.json
rename to v2.0/samples/loadbalancer/healthmonitors-associate-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/healthmonitors-associate-res.json b/v2.0/samples/loadbalancer/healthmonitors-associate-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/healthmonitors-associate-res.json
rename to v2.0/samples/loadbalancer/healthmonitors-associate-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-create-req.json b/v2.0/samples/loadbalancer/members-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-create-req.json
rename to v2.0/samples/loadbalancer/members-create-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-create-res.json b/v2.0/samples/loadbalancer/members-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-create-res.json
rename to v2.0/samples/loadbalancer/members-create-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-list-res.json b/v2.0/samples/loadbalancer/members-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-list-res.json
rename to v2.0/samples/loadbalancer/members-list-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-show-res.json b/v2.0/samples/loadbalancer/members-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-show-res.json
rename to v2.0/samples/loadbalancer/members-show-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-update-req.json b/v2.0/samples/loadbalancer/members-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-update-req.json
rename to v2.0/samples/loadbalancer/members-update-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/members-update-res.json b/v2.0/samples/loadbalancer/members-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/members-update-res.json
rename to v2.0/samples/loadbalancer/members-update-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-create-req.json b/v2.0/samples/loadbalancer/pools-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-create-req.json
rename to v2.0/samples/loadbalancer/pools-create-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-create-res.json b/v2.0/samples/loadbalancer/pools-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-create-res.json
rename to v2.0/samples/loadbalancer/pools-create-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-list-res.json b/v2.0/samples/loadbalancer/pools-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-list-res.json
rename to v2.0/samples/loadbalancer/pools-list-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-show-res.json b/v2.0/samples/loadbalancer/pools-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-show-res.json
rename to v2.0/samples/loadbalancer/pools-show-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-update-req.json b/v2.0/samples/loadbalancer/pools-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-update-req.json
rename to v2.0/samples/loadbalancer/pools-update-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/pools-update-res.json b/v2.0/samples/loadbalancer/pools-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/pools-update-res.json
rename to v2.0/samples/loadbalancer/pools-update-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-create-req.json b/v2.0/samples/loadbalancer/vips-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-create-req.json
rename to v2.0/samples/loadbalancer/vips-create-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-create-res.json b/v2.0/samples/loadbalancer/vips-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-create-res.json
rename to v2.0/samples/loadbalancer/vips-create-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-list-res.json b/v2.0/samples/loadbalancer/vips-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-list-res.json
rename to v2.0/samples/loadbalancer/vips-list-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-show-res.json b/v2.0/samples/loadbalancer/vips-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-show-res.json
rename to v2.0/samples/loadbalancer/vips-show-res.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-update-req.json b/v2.0/samples/loadbalancer/vips-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-update-req.json
rename to v2.0/samples/loadbalancer/vips-update-req.json
diff --git a/neutron-api-2.0/samples/loadbalancer/vips-update-res.json b/v2.0/samples/loadbalancer/vips-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/loadbalancer/vips-update-res.json
rename to v2.0/samples/loadbalancer/vips-update-res.json
diff --git a/quantum-api-1.0/samples/network-get-detail-res.json b/v2.0/samples/network-get-detail-res.json
similarity index 100%
rename from quantum-api-1.0/samples/network-get-detail-res.json
rename to v2.0/samples/network-get-detail-res.json
diff --git a/quantum-api-1.0/samples/network-get-detail-res.xml b/v2.0/samples/network-get-detail-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/network-get-detail-res.xml
rename to v2.0/samples/network-get-detail-res.xml
diff --git a/quantum-api-1.0/samples/network-get-res.json b/v2.0/samples/network-get-res.json
similarity index 100%
rename from quantum-api-1.0/samples/network-get-res.json
rename to v2.0/samples/network-get-res.json
diff --git a/quantum-api-1.0/samples/network-get-res.xml b/v2.0/samples/network-get-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/network-get-res.xml
rename to v2.0/samples/network-get-res.xml
diff --git a/neutron-api-2.0/samples/network-post-req.json b/v2.0/samples/network-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/network-post-req.json
rename to v2.0/samples/network-post-req.json
diff --git a/quantum-api-1.0/samples/network-post-req.xml b/v2.0/samples/network-post-req.xml
similarity index 100%
rename from quantum-api-1.0/samples/network-post-req.xml
rename to v2.0/samples/network-post-req.xml
diff --git a/neutron-api-2.0/samples/network-post-res.json b/v2.0/samples/network-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/network-post-res.json
rename to v2.0/samples/network-post-res.json
diff --git a/quantum-api-1.0/samples/network-post-res.xml b/v2.0/samples/network-post-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/network-post-res.xml
rename to v2.0/samples/network-post-res.xml
diff --git a/neutron-api-2.0/samples/networks-get-detail-res.json b/v2.0/samples/networks-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-detail-res.json
rename to v2.0/samples/networks-get-detail-res.json
diff --git a/quantum-api-1.0/samples/networks-get-detail-res.xml b/v2.0/samples/networks-get-detail-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/networks-get-detail-res.xml
rename to v2.0/samples/networks-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/networks-get-first-page-res.json b/v2.0/samples/networks-get-first-page-res.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-first-page-res.json
rename to v2.0/samples/networks-get-first-page-res.json
diff --git a/neutron-api-2.0/samples/networks-get-first-page-res.xml b/v2.0/samples/networks-get-first-page-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-first-page-res.xml
rename to v2.0/samples/networks-get-first-page-res.xml
diff --git a/neutron-api-2.0/samples/networks-get-last-page-res.json b/v2.0/samples/networks-get-last-page-res.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-last-page-res.json
rename to v2.0/samples/networks-get-last-page-res.json
diff --git a/neutron-api-2.0/samples/networks-get-last-page-res.xml b/v2.0/samples/networks-get-last-page-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-last-page-res.xml
rename to v2.0/samples/networks-get-last-page-res.xml
diff --git a/neutron-api-2.0/samples/networks-get-res-prov.json b/v2.0/samples/networks-get-res-prov.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-res-prov.json
rename to v2.0/samples/networks-get-res-prov.json
diff --git a/neutron-api-2.0/samples/networks-get-res-prov.xml b/v2.0/samples/networks-get-res-prov.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-res-prov.xml
rename to v2.0/samples/networks-get-res-prov.xml
diff --git a/neutron-api-2.0/samples/networks-get-res.json b/v2.0/samples/networks-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-get-res.json
rename to v2.0/samples/networks-get-res.json
diff --git a/quantum-api-1.0/samples/networks-get-res.xml b/v2.0/samples/networks-get-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/networks-get-res.xml
rename to v2.0/samples/networks-get-res.xml
diff --git a/neutron-api-2.0/samples/networks-post-req-prov.json b/v2.0/samples/networks-post-req-prov.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-req-prov.json
rename to v2.0/samples/networks-post-req-prov.json
diff --git a/neutron-api-2.0/samples/networks-post-req-prov.xml b/v2.0/samples/networks-post-req-prov.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-req-prov.xml
rename to v2.0/samples/networks-post-req-prov.xml
diff --git a/neutron-api-2.0/samples/networks-post-req.json b/v2.0/samples/networks-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-req.json
rename to v2.0/samples/networks-post-req.json
diff --git a/quantum-api-1.0/samples/networks-post-req.xml b/v2.0/samples/networks-post-req.xml
similarity index 100%
rename from quantum-api-1.0/samples/networks-post-req.xml
rename to v2.0/samples/networks-post-req.xml
diff --git a/neutron-api-2.0/samples/networks-post-res.json b/v2.0/samples/networks-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-post-res.json
rename to v2.0/samples/networks-post-res.json
diff --git a/quantum-api-1.0/samples/networks-post-res.xml b/v2.0/samples/networks-post-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/networks-post-res.xml
rename to v2.0/samples/networks-post-res.xml
diff --git a/neutron-api-2.0/samples/networks-put-req-prov.json b/v2.0/samples/networks-put-req-prov.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-put-req-prov.json
rename to v2.0/samples/networks-put-req-prov.json
diff --git a/neutron-api-2.0/samples/networks-put-req-prov.xml b/v2.0/samples/networks-put-req-prov.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-put-req-prov.xml
rename to v2.0/samples/networks-put-req-prov.xml
diff --git a/neutron-api-2.0/samples/networks-show-res-prov.json b/v2.0/samples/networks-show-res-prov.json
similarity index 100%
rename from neutron-api-2.0/samples/networks-show-res-prov.json
rename to v2.0/samples/networks-show-res-prov.json
diff --git a/neutron-api-2.0/samples/networks-show-res-prov.xml b/v2.0/samples/networks-show-res-prov.xml
similarity index 100%
rename from neutron-api-2.0/samples/networks-show-res-prov.xml
rename to v2.0/samples/networks-show-res-prov.xml
diff --git a/quantum-api-1.0/samples/notfound.json b/v2.0/samples/notfound.json
similarity index 100%
rename from quantum-api-1.0/samples/notfound.json
rename to v2.0/samples/notfound.json
diff --git a/quantum-api-1.0/samples/notfound.xml b/v2.0/samples/notfound.xml
similarity index 100%
rename from quantum-api-1.0/samples/notfound.xml
rename to v2.0/samples/notfound.xml
diff --git a/quantum-api-1.0/samples/notimplemented.json b/v2.0/samples/notimplemented.json
similarity index 100%
rename from quantum-api-1.0/samples/notimplemented.json
rename to v2.0/samples/notimplemented.json
diff --git a/quantum-api-1.0/samples/notimplemented.xml b/v2.0/samples/notimplemented.xml
similarity index 100%
rename from quantum-api-1.0/samples/notimplemented.xml
rename to v2.0/samples/notimplemented.xml
diff --git a/neutron-api-2.0/samples/port-create-req-edo.json b/v2.0/samples/port-create-req-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-create-req-edo.json
rename to v2.0/samples/port-create-req-edo.json
diff --git a/neutron-api-2.0/samples/port-create-res-edo.json b/v2.0/samples/port-create-res-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-create-res-edo.json
rename to v2.0/samples/port-create-res-edo.json
diff --git a/quantum-api-1.0/samples/port-get-detail-res.json b/v2.0/samples/port-get-detail-res.json
similarity index 100%
rename from quantum-api-1.0/samples/port-get-detail-res.json
rename to v2.0/samples/port-get-detail-res.json
diff --git a/quantum-api-1.0/samples/port-get-detail-res.xml b/v2.0/samples/port-get-detail-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/port-get-detail-res.xml
rename to v2.0/samples/port-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/port-get-res-edo.json b/v2.0/samples/port-get-res-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-get-res-edo.json
rename to v2.0/samples/port-get-res-edo.json
diff --git a/neutron-api-2.0/samples/port-get-res.json b/v2.0/samples/port-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/port-get-res.json
rename to v2.0/samples/port-get-res.json
diff --git a/quantum-api-1.0/samples/port-get-res.xml b/v2.0/samples/port-get-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/port-get-res.xml
rename to v2.0/samples/port-get-res.xml
diff --git a/neutron-api-2.0/samples/port-post-req.json b/v2.0/samples/port-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/port-post-req.json
rename to v2.0/samples/port-post-req.json
diff --git a/quantum-api-1.0/samples/port-post-req.xml b/v2.0/samples/port-post-req.xml
similarity index 100%
rename from quantum-api-1.0/samples/port-post-req.xml
rename to v2.0/samples/port-post-req.xml
diff --git a/neutron-api-2.0/samples/port-post-res.json b/v2.0/samples/port-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/port-post-res.json
rename to v2.0/samples/port-post-res.json
diff --git a/quantum-api-1.0/samples/port-post-res.xml b/v2.0/samples/port-post-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/port-post-res.xml
rename to v2.0/samples/port-post-res.xml
diff --git a/neutron-api-2.0/samples/port-put-req.json b/v2.0/samples/port-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/port-put-req.json
rename to v2.0/samples/port-put-req.json
diff --git a/neutron-api-2.0/samples/port-put-res.json b/v2.0/samples/port-put-res.json
similarity index 100%
rename from neutron-api-2.0/samples/port-put-res.json
rename to v2.0/samples/port-put-res.json
diff --git a/neutron-api-2.0/samples/port-show-res-edo.json b/v2.0/samples/port-show-res-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-show-res-edo.json
rename to v2.0/samples/port-show-res-edo.json
diff --git a/neutron-api-2.0/samples/port-update-req-edo.json b/v2.0/samples/port-update-req-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-update-req-edo.json
rename to v2.0/samples/port-update-req-edo.json
diff --git a/neutron-api-2.0/samples/port-update-res-edo.json b/v2.0/samples/port-update-res-edo.json
similarity index 100%
rename from neutron-api-2.0/samples/port-update-res-edo.json
rename to v2.0/samples/port-update-res-edo.json
diff --git a/quantum-api-1.0/samples/ports-get-detail-res.json b/v2.0/samples/ports-get-detail-res.json
similarity index 100%
rename from quantum-api-1.0/samples/ports-get-detail-res.json
rename to v2.0/samples/ports-get-detail-res.json
diff --git a/quantum-api-1.0/samples/ports-get-detail-res.xml b/v2.0/samples/ports-get-detail-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/ports-get-detail-res.xml
rename to v2.0/samples/ports-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/ports-get-res-addr-pairs.json b/v2.0/samples/ports-get-res-addr-pairs.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-res-addr-pairs.json
rename to v2.0/samples/ports-get-res-addr-pairs.json
diff --git a/neutron-api-2.0/samples/ports-get-res-addr-pairs.xml b/v2.0/samples/ports-get-res-addr-pairs.xml
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-res-addr-pairs.xml
rename to v2.0/samples/ports-get-res-addr-pairs.xml
diff --git a/neutron-api-2.0/samples/ports-get-res.json b/v2.0/samples/ports-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-get-res.json
rename to v2.0/samples/ports-get-res.json
diff --git a/quantum-api-1.0/samples/ports-get-res.xml b/v2.0/samples/ports-get-res.xml
similarity index 100%
rename from quantum-api-1.0/samples/ports-get-res.xml
rename to v2.0/samples/ports-get-res.xml
diff --git a/neutron-api-2.0/samples/ports-post-req-addr-pairs.json b/v2.0/samples/ports-post-req-addr-pairs.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-post-req-addr-pairs.json
rename to v2.0/samples/ports-post-req-addr-pairs.json
diff --git a/neutron-api-2.0/samples/ports-put-req-addr-pair.json b/v2.0/samples/ports-put-req-addr-pair.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-put-req-addr-pair.json
rename to v2.0/samples/ports-put-req-addr-pair.json
diff --git a/neutron-api-2.0/samples/ports-show-addr-pair.json b/v2.0/samples/ports-show-addr-pair.json
similarity index 100%
rename from neutron-api-2.0/samples/ports-show-addr-pair.json
rename to v2.0/samples/ports-show-addr-pair.json
diff --git a/neutron-api-2.0/samples/ports-show-addr-pair.xml b/v2.0/samples/ports-show-addr-pair.xml
similarity index 100%
rename from neutron-api-2.0/samples/ports-show-addr-pair.xml
rename to v2.0/samples/ports-show-addr-pair.xml
diff --git a/quantum-api-1.0/samples/private.json b/v2.0/samples/private.json
similarity index 100%
rename from quantum-api-1.0/samples/private.json
rename to v2.0/samples/private.json
diff --git a/quantum-api-1.0/samples/private.xml b/v2.0/samples/private.xml
similarity index 100%
rename from quantum-api-1.0/samples/private.xml
rename to v2.0/samples/private.xml
diff --git a/quantum-api-1.0/samples/public.json b/v2.0/samples/public.json
similarity index 100%
rename from quantum-api-1.0/samples/public.json
rename to v2.0/samples/public.json
diff --git a/quantum-api-1.0/samples/public.xml b/v2.0/samples/public.xml
similarity index 100%
rename from quantum-api-1.0/samples/public.xml
rename to v2.0/samples/public.xml
diff --git a/neutron-api-2.0/samples/quotas-list-res.json b/v2.0/samples/quotas-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/quotas-list-res.json
rename to v2.0/samples/quotas-list-res.json
diff --git a/neutron-api-2.0/samples/quotas-put-req.json b/v2.0/samples/quotas-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/quotas-put-req.json
rename to v2.0/samples/quotas-put-req.json
diff --git a/neutron-api-2.0/samples/quotas-put-res.json b/v2.0/samples/quotas-put-res.json
similarity index 100%
rename from neutron-api-2.0/samples/quotas-put-res.json
rename to v2.0/samples/quotas-put-res.json
diff --git a/neutron-api-2.0/samples/quotas-show-res.json b/v2.0/samples/quotas-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/quotas-show-res.json
rename to v2.0/samples/quotas-show-res.json
diff --git a/neutron-api-2.0/samples/router-port-res.json b/v2.0/samples/router-port-res.json
similarity index 100%
rename from neutron-api-2.0/samples/router-port-res.json
rename to v2.0/samples/router-port-res.json
diff --git a/neutron-api-2.0/samples/routers-get-res.json b/v2.0/samples/routers-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-get-res.json
rename to v2.0/samples/routers-get-res.json
diff --git a/neutron-api-2.0/samples/routers-post-req.json b/v2.0/samples/routers-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-post-req.json
rename to v2.0/samples/routers-post-req.json
diff --git a/neutron-api-2.0/samples/routers-post-res.json b/v2.0/samples/routers-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-post-res.json
rename to v2.0/samples/routers-post-res.json
diff --git a/neutron-api-2.0/samples/routers-put-req.json b/v2.0/samples/routers-put-req.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-put-req.json
rename to v2.0/samples/routers-put-req.json
diff --git a/neutron-api-2.0/samples/routers-put-res.json b/v2.0/samples/routers-put-res.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-put-res.json
rename to v2.0/samples/routers-put-res.json
diff --git a/neutron-api-2.0/samples/routers-show-res.json b/v2.0/samples/routers-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/routers-show-res.json
rename to v2.0/samples/routers-show-res.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-create-req.json b/v2.0/samples/rules-security-groups-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-create-req.json
rename to v2.0/samples/rules-security-groups-create-req.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-create-resp.json b/v2.0/samples/rules-security-groups-create-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-create-resp.json
rename to v2.0/samples/rules-security-groups-create-resp.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-delete-req.json b/v2.0/samples/rules-security-groups-delete-req.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-delete-req.json
rename to v2.0/samples/rules-security-groups-delete-req.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-delete-resp.json b/v2.0/samples/rules-security-groups-delete-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-delete-resp.json
rename to v2.0/samples/rules-security-groups-delete-resp.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-get-req.json b/v2.0/samples/rules-security-groups-get-req.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-get-req.json
rename to v2.0/samples/rules-security-groups-get-req.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-get-resp.json b/v2.0/samples/rules-security-groups-get-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-get-resp.json
rename to v2.0/samples/rules-security-groups-get-resp.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-list-get-req.json b/v2.0/samples/rules-security-groups-list-get-req.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-list-get-req.json
rename to v2.0/samples/rules-security-groups-list-get-req.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-list-get-resp.json b/v2.0/samples/rules-security-groups-list-get-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-list-get-resp.json
rename to v2.0/samples/rules-security-groups-list-get-resp.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-post-req.json b/v2.0/samples/rules-security-groups-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-post-req.json
rename to v2.0/samples/rules-security-groups-post-req.json
diff --git a/neutron-api-2.0/samples/rules-security-groups-post-resp.json b/v2.0/samples/rules-security-groups-post-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/rules-security-groups-post-resp.json
rename to v2.0/samples/rules-security-groups-post-resp.json
diff --git a/neutron-api-2.0/samples/sche-dhcp-list-res.json b/v2.0/samples/sche-dhcp-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-dhcp-list-res.json
rename to v2.0/samples/sche-dhcp-list-res.json
diff --git a/neutron-api-2.0/samples/sche-l3-list-res.json b/v2.0/samples/sche-l3-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-l3-list-res.json
rename to v2.0/samples/sche-l3-list-res.json
diff --git a/neutron-api-2.0/samples/sche-network-dhcp-req.json b/v2.0/samples/sche-network-dhcp-req.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-network-dhcp-req.json
rename to v2.0/samples/sche-network-dhcp-req.json
diff --git a/neutron-api-2.0/samples/sche-network-dhcp-res.json b/v2.0/samples/sche-network-dhcp-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-network-dhcp-res.json
rename to v2.0/samples/sche-network-dhcp-res.json
diff --git a/neutron-api-2.0/samples/sche-network-list-res.json b/v2.0/samples/sche-network-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-network-list-res.json
rename to v2.0/samples/sche-network-list-res.json
diff --git a/neutron-api-2.0/samples/sche-router-l3-req.json b/v2.0/samples/sche-router-l3-req.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-router-l3-req.json
rename to v2.0/samples/sche-router-l3-req.json
diff --git a/neutron-api-2.0/samples/sche-router-l3-res.json b/v2.0/samples/sche-router-l3-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-router-l3-res.json
rename to v2.0/samples/sche-router-l3-res.json
diff --git a/neutron-api-2.0/samples/sche-router-list-res.json b/v2.0/samples/sche-router-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/sche-router-list-res.json
rename to v2.0/samples/sche-router-list-res.json
diff --git a/neutron-api-2.0/samples/security-group-post-req.json b/v2.0/samples/security-group-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/security-group-post-req.json
rename to v2.0/samples/security-group-post-req.json
diff --git a/neutron-api-2.0/samples/security-groups-create-req.json b/v2.0/samples/security-groups-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-create-req.json
rename to v2.0/samples/security-groups-create-req.json
diff --git a/neutron-api-2.0/samples/security-groups-create-resp.json b/v2.0/samples/security-groups-create-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-create-resp.json
rename to v2.0/samples/security-groups-create-resp.json
diff --git a/neutron-api-2.0/samples/security-groups-delete-req.json b/v2.0/samples/security-groups-delete-req.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-delete-req.json
rename to v2.0/samples/security-groups-delete-req.json
diff --git a/neutron-api-2.0/samples/security-groups-delete-resp.json b/v2.0/samples/security-groups-delete-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-delete-resp.json
rename to v2.0/samples/security-groups-delete-resp.json
diff --git a/neutron-api-2.0/samples/security-groups-get-req.json b/v2.0/samples/security-groups-get-req.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-get-req.json
rename to v2.0/samples/security-groups-get-req.json
diff --git a/neutron-api-2.0/samples/security-groups-get-resp.json b/v2.0/samples/security-groups-get-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-get-resp.json
rename to v2.0/samples/security-groups-get-resp.json
diff --git a/neutron-api-2.0/samples/security-groups-list-get-req.json b/v2.0/samples/security-groups-list-get-req.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-list-get-req.json
rename to v2.0/samples/security-groups-list-get-req.json
diff --git a/neutron-api-2.0/samples/security-groups-list-get-resp.json b/v2.0/samples/security-groups-list-get-resp.json
similarity index 100%
rename from neutron-api-2.0/samples/security-groups-list-get-resp.json
rename to v2.0/samples/security-groups-list-get-resp.json
diff --git a/neutron-api-2.0/samples/subnet-get-detail-res.json b/v2.0/samples/subnet-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/subnet-get-detail-res.json
rename to v2.0/samples/subnet-get-detail-res.json
diff --git a/neutron-api-2.0/samples/subnet-get-detail-res.xml b/v2.0/samples/subnet-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnet-get-detail-res.xml
rename to v2.0/samples/subnet-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/subnet-get-res.json b/v2.0/samples/subnet-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/subnet-get-res.json
rename to v2.0/samples/subnet-get-res.json
diff --git a/neutron-api-2.0/samples/subnet-get-res.xml b/v2.0/samples/subnet-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnet-get-res.xml
rename to v2.0/samples/subnet-get-res.xml
diff --git a/neutron-api-2.0/samples/subnet-post-req.json b/v2.0/samples/subnet-post-req.json
similarity index 100%
rename from neutron-api-2.0/samples/subnet-post-req.json
rename to v2.0/samples/subnet-post-req.json
diff --git a/neutron-api-2.0/samples/subnet-post-req.xml b/v2.0/samples/subnet-post-req.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnet-post-req.xml
rename to v2.0/samples/subnet-post-req.xml
diff --git a/neutron-api-2.0/samples/subnet-post-res.json b/v2.0/samples/subnet-post-res.json
similarity index 100%
rename from neutron-api-2.0/samples/subnet-post-res.json
rename to v2.0/samples/subnet-post-res.json
diff --git a/neutron-api-2.0/samples/subnet-post-res.xml b/v2.0/samples/subnet-post-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnet-post-res.xml
rename to v2.0/samples/subnet-post-res.xml
diff --git a/neutron-api-2.0/samples/subnets-get-detail-res.json b/v2.0/samples/subnets-get-detail-res.json
similarity index 100%
rename from neutron-api-2.0/samples/subnets-get-detail-res.json
rename to v2.0/samples/subnets-get-detail-res.json
diff --git a/neutron-api-2.0/samples/subnets-get-detail-res.xml b/v2.0/samples/subnets-get-detail-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnets-get-detail-res.xml
rename to v2.0/samples/subnets-get-detail-res.xml
diff --git a/neutron-api-2.0/samples/subnets-get-res.json b/v2.0/samples/subnets-get-res.json
similarity index 100%
rename from neutron-api-2.0/samples/subnets-get-res.json
rename to v2.0/samples/subnets-get-res.json
diff --git a/neutron-api-2.0/samples/subnets-get-res.xml b/v2.0/samples/subnets-get-res.xml
similarity index 100%
rename from neutron-api-2.0/samples/subnets-get-res.xml
rename to v2.0/samples/subnets-get-res.xml
diff --git a/neutron-api-2.0/samples/subnets_get_resp.json b/v2.0/samples/subnets_get_resp.json
similarity index 100%
rename from neutron-api-2.0/samples/subnets_get_resp.json
rename to v2.0/samples/subnets_get_resp.json
diff --git a/quantum-api-1.0/samples/versions-atom.xml b/v2.0/samples/versions-atom.xml
similarity index 100%
rename from quantum-api-1.0/samples/versions-atom.xml
rename to v2.0/samples/versions-atom.xml
diff --git a/quantum-api-1.0/samples/versions.json b/v2.0/samples/versions.json
similarity index 100%
rename from quantum-api-1.0/samples/versions.json
rename to v2.0/samples/versions.json
diff --git a/quantum-api-1.0/samples/versions.xml b/v2.0/samples/versions.xml
similarity index 100%
rename from quantum-api-1.0/samples/versions.xml
rename to v2.0/samples/versions.xml
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-create-req.json b/v2.0/samples/vpn/ikepolicy-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-create-req.json
rename to v2.0/samples/vpn/ikepolicy-create-req.json
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-create-res.json b/v2.0/samples/vpn/ikepolicy-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-create-res.json
rename to v2.0/samples/vpn/ikepolicy-create-res.json
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-list-res.json b/v2.0/samples/vpn/ikepolicy-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-list-res.json
rename to v2.0/samples/vpn/ikepolicy-list-res.json
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-show-res.json b/v2.0/samples/vpn/ikepolicy-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-show-res.json
rename to v2.0/samples/vpn/ikepolicy-show-res.json
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-update-req.json b/v2.0/samples/vpn/ikepolicy-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-update-req.json
rename to v2.0/samples/vpn/ikepolicy-update-req.json
diff --git a/neutron-api-2.0/samples/vpn/ikepolicy-update-res.json b/v2.0/samples/vpn/ikepolicy-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ikepolicy-update-res.json
rename to v2.0/samples/vpn/ikepolicy-update-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-create-req.json b/v2.0/samples/vpn/ipsec-site-connection-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-create-req.json
rename to v2.0/samples/vpn/ipsec-site-connection-create-req.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-create-res.json b/v2.0/samples/vpn/ipsec-site-connection-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-create-res.json
rename to v2.0/samples/vpn/ipsec-site-connection-create-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-list-res.json b/v2.0/samples/vpn/ipsec-site-connection-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-list-res.json
rename to v2.0/samples/vpn/ipsec-site-connection-list-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-show-res.json b/v2.0/samples/vpn/ipsec-site-connection-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-show-res.json
rename to v2.0/samples/vpn/ipsec-site-connection-show-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-update-req.json b/v2.0/samples/vpn/ipsec-site-connection-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-update-req.json
rename to v2.0/samples/vpn/ipsec-site-connection-update-req.json
diff --git a/neutron-api-2.0/samples/vpn/ipsec-site-connection-update-res.json b/v2.0/samples/vpn/ipsec-site-connection-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsec-site-connection-update-res.json
rename to v2.0/samples/vpn/ipsec-site-connection-update-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-create-req.json b/v2.0/samples/vpn/ipsecpolicy-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-create-req.json
rename to v2.0/samples/vpn/ipsecpolicy-create-req.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-create-res.json b/v2.0/samples/vpn/ipsecpolicy-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-create-res.json
rename to v2.0/samples/vpn/ipsecpolicy-create-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-list-res.json b/v2.0/samples/vpn/ipsecpolicy-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-list-res.json
rename to v2.0/samples/vpn/ipsecpolicy-list-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-show-res.json b/v2.0/samples/vpn/ipsecpolicy-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-show-res.json
rename to v2.0/samples/vpn/ipsecpolicy-show-res.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-update-req.json b/v2.0/samples/vpn/ipsecpolicy-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-update-req.json
rename to v2.0/samples/vpn/ipsecpolicy-update-req.json
diff --git a/neutron-api-2.0/samples/vpn/ipsecpolicy-update-res.json b/v2.0/samples/vpn/ipsecpolicy-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/ipsecpolicy-update-res.json
rename to v2.0/samples/vpn/ipsecpolicy-update-res.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-create-req.json b/v2.0/samples/vpn/vpnservice-create-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-create-req.json
rename to v2.0/samples/vpn/vpnservice-create-req.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-create-res.json b/v2.0/samples/vpn/vpnservice-create-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-create-res.json
rename to v2.0/samples/vpn/vpnservice-create-res.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-list-res.json b/v2.0/samples/vpn/vpnservice-list-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-list-res.json
rename to v2.0/samples/vpn/vpnservice-list-res.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-show-res.json b/v2.0/samples/vpn/vpnservice-show-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-show-res.json
rename to v2.0/samples/vpn/vpnservice-show-res.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-update-req.json b/v2.0/samples/vpn/vpnservice-update-req.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-update-req.json
rename to v2.0/samples/vpn/vpnservice-update-req.json
diff --git a/neutron-api-2.0/samples/vpn/vpnservice-update-res.json b/v2.0/samples/vpn/vpnservice-update-res.json
similarity index 100%
rename from neutron-api-2.0/samples/vpn/vpnservice-update-res.json
rename to v2.0/samples/vpn/vpnservice-update-res.json
diff --git a/quantum-api-1.0/style/schema.css b/v2.0/style/schema.css
similarity index 100%
rename from quantum-api-1.0/style/schema.css
rename to v2.0/style/schema.css
diff --git a/quantum-api-1.0/style/shjs/sh_acid.css b/v2.0/style/shjs/sh_acid.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_acid.css
rename to v2.0/style/shjs/sh_acid.css
diff --git a/quantum-api-1.0/style/shjs/sh_darkblue.css b/v2.0/style/shjs/sh_darkblue.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_darkblue.css
rename to v2.0/style/shjs/sh_darkblue.css
diff --git a/quantum-api-1.0/style/shjs/sh_emacs.css b/v2.0/style/shjs/sh_emacs.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_emacs.css
rename to v2.0/style/shjs/sh_emacs.css
diff --git a/quantum-api-1.0/style/shjs/sh_night.css b/v2.0/style/shjs/sh_night.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_night.css
rename to v2.0/style/shjs/sh_night.css
diff --git a/quantum-api-1.0/style/shjs/sh_pablo.css b/v2.0/style/shjs/sh_pablo.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_pablo.css
rename to v2.0/style/shjs/sh_pablo.css
diff --git a/quantum-api-1.0/style/shjs/sh_print.css b/v2.0/style/shjs/sh_print.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_print.css
rename to v2.0/style/shjs/sh_print.css
diff --git a/quantum-api-1.0/style/shjs/sh_style.css b/v2.0/style/shjs/sh_style.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_style.css
rename to v2.0/style/shjs/sh_style.css
diff --git a/quantum-api-1.0/style/shjs/sh_whitengrey.css b/v2.0/style/shjs/sh_whitengrey.css
similarity index 100%
rename from quantum-api-1.0/style/shjs/sh_whitengrey.css
rename to v2.0/style/shjs/sh_whitengrey.css
diff --git a/neutron-api-2.0/wadl/security-groups.wadl b/v2.0/wadl/security-groups.wadl
similarity index 100%
rename from neutron-api-2.0/wadl/security-groups.wadl
rename to v2.0/wadl/security-groups.wadl
diff --git a/quantum-api-1.0/xsd/.htaccess b/v2.0/xsd/.htaccess
similarity index 100%
rename from quantum-api-1.0/xsd/.htaccess
rename to v2.0/xsd/.htaccess
diff --git a/quantum-api-1.0/xsd/actions.xsd b/v2.0/xsd/actions.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/actions.xsd
rename to v2.0/xsd/actions.xsd
diff --git a/quantum-api-1.0/xsd/affinity-id.xjb b/v2.0/xsd/affinity-id.xjb
similarity index 100%
rename from quantum-api-1.0/xsd/affinity-id.xjb
rename to v2.0/xsd/affinity-id.xjb
diff --git a/quantum-api-1.0/xsd/affinity-id.xsd b/v2.0/xsd/affinity-id.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/affinity-id.xsd
rename to v2.0/xsd/affinity-id.xsd
diff --git a/quantum-api-1.0/xsd/api-common.xjb b/v2.0/xsd/api-common.xjb
similarity index 100%
rename from quantum-api-1.0/xsd/api-common.xjb
rename to v2.0/xsd/api-common.xjb
diff --git a/quantum-api-1.0/xsd/api-common.xsd b/v2.0/xsd/api-common.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/api-common.xsd
rename to v2.0/xsd/api-common.xsd
diff --git a/quantum-api-1.0/xsd/api.xjb b/v2.0/xsd/api.xjb
similarity index 100%
rename from quantum-api-1.0/xsd/api.xjb
rename to v2.0/xsd/api.xjb
diff --git a/quantum-api-1.0/xsd/api.xsd b/v2.0/xsd/api.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/api.xsd
rename to v2.0/xsd/api.xsd
diff --git a/quantum-api-1.0/xsd/atom.xjb b/v2.0/xsd/atom.xjb
similarity index 100%
rename from quantum-api-1.0/xsd/atom.xjb
rename to v2.0/xsd/atom.xjb
diff --git a/quantum-api-1.0/xsd/atom/atom.xsd b/v2.0/xsd/atom/atom.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/atom/atom.xsd
rename to v2.0/xsd/atom/atom.xsd
diff --git a/quantum-api-1.0/xsd/atom/xml.xsd b/v2.0/xsd/atom/xml.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/atom/xml.xsd
rename to v2.0/xsd/atom/xml.xsd
diff --git a/quantum-api-1.0/xsd/backup.xsd b/v2.0/xsd/backup.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/backup.xsd
rename to v2.0/xsd/backup.xsd
diff --git a/quantum-api-1.0/xsd/common.xsd b/v2.0/xsd/common.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/common.xsd
rename to v2.0/xsd/common.xsd
diff --git a/quantum-api-1.0/xsd/ext/rax-dme/api.xsd b/v2.0/xsd/ext/rax-dme/api.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/ext/rax-dme/api.xsd
rename to v2.0/xsd/ext/rax-dme/api.xsd
diff --git a/quantum-api-1.0/xsd/ext/rax-dme/rax-dme.xsd b/v2.0/xsd/ext/rax-dme/rax-dme.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/ext/rax-dme/rax-dme.xsd
rename to v2.0/xsd/ext/rax-dme/rax-dme.xsd
diff --git a/quantum-api-1.0/xsd/extensions.xsd b/v2.0/xsd/extensions.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/extensions.xsd
rename to v2.0/xsd/extensions.xsd
diff --git a/quantum-api-1.0/xsd/faults.xsd b/v2.0/xsd/faults.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/faults.xsd
rename to v2.0/xsd/faults.xsd
diff --git a/quantum-api-1.0/xsd/flavor.xsd b/v2.0/xsd/flavor.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/flavor.xsd
rename to v2.0/xsd/flavor.xsd
diff --git a/quantum-api-1.0/xsd/image.xsd b/v2.0/xsd/image.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/image.xsd
rename to v2.0/xsd/image.xsd
diff --git a/quantum-api-1.0/xsd/ipgroup.xsd b/v2.0/xsd/ipgroup.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/ipgroup.xsd
rename to v2.0/xsd/ipgroup.xsd
diff --git a/quantum-api-1.0/xsd/limits.xsd b/v2.0/xsd/limits.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/limits.xsd
rename to v2.0/xsd/limits.xsd
diff --git a/quantum-api-1.0/xsd/metadata.xsd b/v2.0/xsd/metadata.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/metadata.xsd
rename to v2.0/xsd/metadata.xsd
diff --git a/neutron-api-2.0/xsd/secgr.xsd b/v2.0/xsd/secgr.xsd
similarity index 100%
rename from neutron-api-2.0/xsd/secgr.xsd
rename to v2.0/xsd/secgr.xsd
diff --git a/quantum-api-1.0/xsd/server.xsd b/v2.0/xsd/server.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/server.xsd
rename to v2.0/xsd/server.xsd
diff --git a/quantum-api-1.0/xsd/shareip.xjb b/v2.0/xsd/shareip.xjb
similarity index 100%
rename from quantum-api-1.0/xsd/shareip.xjb
rename to v2.0/xsd/shareip.xjb
diff --git a/quantum-api-1.0/xsd/shareip.xsd b/v2.0/xsd/shareip.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/shareip.xsd
rename to v2.0/xsd/shareip.xsd
diff --git a/quantum-api-1.0/xsd/txt.htaccess b/v2.0/xsd/txt.htaccess
similarity index 100%
rename from quantum-api-1.0/xsd/txt.htaccess
rename to v2.0/xsd/txt.htaccess
diff --git a/quantum-api-1.0/xsd/version.xsd b/v2.0/xsd/version.xsd
similarity index 100%
rename from quantum-api-1.0/xsd/version.xsd
rename to v2.0/xsd/version.xsd
diff --git a/quantum-api-1.0/xslt/schema.xsl b/v2.0/xslt/schema.xsl
similarity index 100%
rename from quantum-api-1.0/xslt/schema.xsl
rename to v2.0/xslt/schema.xsl