diff --git a/openstack-identity-api/pom.xml b/openstack-identity-api/v2.0/pom.xml
similarity index 100%
rename from openstack-identity-api/pom.xml
rename to openstack-identity-api/v2.0/pom.xml
diff --git a/openstack-identity-api/src/docbkx/HP-IDM/HP-IDM.xml b/openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/HP-IDM/HP-IDM.xml
rename to openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml
diff --git a/openstack-identity-api/src/docbkx/HP-IDM/samples/sample_request.txt b/openstack-identity-api/v2.0/src/docbkx/HP-IDM/samples/sample_request.txt
similarity index 100%
rename from openstack-identity-api/src/docbkx/HP-IDM/samples/sample_request.txt
rename to openstack-identity-api/v2.0/src/docbkx/HP-IDM/samples/sample_request.txt
diff --git a/openstack-identity-api/src/docbkx/HP-IDM/samples/sample_request_with_global_sid.txt b/openstack-identity-api/v2.0/src/docbkx/HP-IDM/samples/sample_request_with_global_sid.txt
similarity index 100%
rename from openstack-identity-api/src/docbkx/HP-IDM/samples/sample_request_with_global_sid.txt
rename to openstack-identity-api/v2.0/src/docbkx/HP-IDM/samples/sample_request_with_global_sid.txt
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/credentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/credentials.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/credentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/credentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/passwordcredentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/passwordcredentials.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/passwordcredentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/passwordcredentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/role.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/role.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/role.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/role.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/roles.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/roles.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/roles.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/roles.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/service.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/service.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/service.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/service.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/services.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/services.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/services.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/services.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/tenant.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/tenant.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/tenant.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/tenant.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/tenantwithoutid.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/tenantwithoutid.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/user.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/user.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/user.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/user.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/users.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/users.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/users.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/users.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithenabledonly.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithenabledonly.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithoutid.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithoutid.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithoutid.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSADM/samples/userwithoutid.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoint.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoint.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoint.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoint.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoints.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoints.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSCATALOG/samples/endpoints.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/credentialswithec2.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/credentialswithec2.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/ec2Credentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/ec2Credentials.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSS3/samples/credentialswiths3.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSS3/samples/credentialswiths3.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSS3/samples/credentialswiths3.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSS3/samples/credentialswiths3.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSS3/samples/s3Credentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSS3/samples/s3Credentials.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSS3/samples/s3Credentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSS3/samples/s3Credentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/endpoints.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml
diff --git a/openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json
diff --git a/openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml
rename to openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-create.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-create.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-create.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-create.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-update.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-update.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-update.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-for-update.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-updated.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-updated.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-updated.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group-updated.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/group.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/groups.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/groups.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/groups.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/groups.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/users.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/users.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json
diff --git a/openstack-identity-api/src/docbkx/RAX-GRPADM/samples/users.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-GRPADM/samples/users.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentials.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentials.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentials.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml
diff --git a/openstack-identity-api/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json
diff --git a/openstack-identity-api/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml
rename to openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml
diff --git a/openstack-identity-api/src/docbkx/admin/identity-service-api.xml b/openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/admin/identity-service-api.xml
rename to openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml
diff --git a/openstack-identity-api/src/docbkx/client/identity-client-api.xml b/openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/client/identity-client-api.xml
rename to openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml
diff --git a/openstack-identity-api/src/docbkx/common/ch_hp_extensions.xml b/openstack-identity-api/v2.0/src/docbkx/common/ch_hp_extensions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/ch_hp_extensions.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/ch_hp_extensions.xml
diff --git a/openstack-identity-api/src/docbkx/common/ch_os_extensions.xml b/openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/ch_os_extensions.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml
diff --git a/openstack-identity-api/src/docbkx/common/ch_rax_extensions.xml b/openstack-identity-api/v2.0/src/docbkx/common/ch_rax_extensions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/ch_rax_extensions.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/ch_rax_extensions.xml
diff --git a/openstack-identity-api/src/docbkx/common/ch_rax_identity_extensions.xml b/openstack-identity-api/v2.0/src/docbkx/common/ch_rax_identity_extensions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/ch_rax_identity_extensions.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/ch_rax_identity_extensions.xml
diff --git a/openstack-identity-api/src/docbkx/common/identity-concepts.xml b/openstack-identity-api/v2.0/src/docbkx/common/identity-concepts.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/identity-concepts.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/identity-concepts.xml
diff --git a/openstack-identity-api/src/docbkx/common/identity-dev-guide.xml b/openstack-identity-api/v2.0/src/docbkx/common/identity-dev-guide.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/identity-dev-guide.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/identity-dev-guide.xml
diff --git a/openstack-identity-api/src/docbkx/common/identity-general-api-info.xml b/openstack-identity-api/v2.0/src/docbkx/common/identity-general-api-info.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/identity-general-api-info.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/identity-general-api-info.xml
diff --git a/openstack-identity-api/src/docbkx/common/identity-service-api.xml b/openstack-identity-api/v2.0/src/docbkx/common/identity-service-api.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/identity-service-api.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/identity-service-api.xml
diff --git a/openstack-identity-api/src/docbkx/common/preface.xml b/openstack-identity-api/v2.0/src/docbkx/common/preface.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/common/preface.xml
rename to openstack-identity-api/v2.0/src/docbkx/common/preface.xml
diff --git a/openstack-identity-api/src/docbkx/img/Check_mark_23x20_02.svg b/openstack-identity-api/v2.0/src/docbkx/img/Check_mark_23x20_02.svg
similarity index 100%
rename from openstack-identity-api/src/docbkx/img/Check_mark_23x20_02.svg
rename to openstack-identity-api/v2.0/src/docbkx/img/Check_mark_23x20_02.svg
diff --git a/openstack-identity-api/src/docbkx/js/shjs/sh_java.js b/openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_java.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/shjs/sh_java.js
rename to openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_java.js
diff --git a/openstack-identity-api/src/docbkx/js/shjs/sh_javascript.js b/openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_javascript.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/shjs/sh_javascript.js
rename to openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_javascript.js
diff --git a/openstack-identity-api/src/docbkx/js/shjs/sh_main.js b/openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_main.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/shjs/sh_main.js
rename to openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_main.js
diff --git a/openstack-identity-api/src/docbkx/js/shjs/sh_xml.js b/openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_xml.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/shjs/sh_xml.js
rename to openstack-identity-api/v2.0/src/docbkx/js/shjs/sh_xml.js
diff --git a/openstack-identity-api/src/docbkx/js/trc/schema/controller.js b/openstack-identity-api/v2.0/src/docbkx/js/trc/schema/controller.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/trc/schema/controller.js
rename to openstack-identity-api/v2.0/src/docbkx/js/trc/schema/controller.js
diff --git a/openstack-identity-api/src/docbkx/js/trc/schema/layoutManager.js b/openstack-identity-api/v2.0/src/docbkx/js/trc/schema/layoutManager.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/trc/schema/layoutManager.js
rename to openstack-identity-api/v2.0/src/docbkx/js/trc/schema/layoutManager.js
diff --git a/openstack-identity-api/src/docbkx/js/trc/schema/sampleManager.js b/openstack-identity-api/v2.0/src/docbkx/js/trc/schema/sampleManager.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/trc/schema/sampleManager.js
rename to openstack-identity-api/v2.0/src/docbkx/js/trc/schema/sampleManager.js
diff --git a/openstack-identity-api/src/docbkx/js/trc/util.js b/openstack-identity-api/v2.0/src/docbkx/js/trc/util.js
similarity index 100%
rename from openstack-identity-api/src/docbkx/js/trc/util.js
rename to openstack-identity-api/v2.0/src/docbkx/js/trc/util.js
diff --git a/openstack-identity-api/src/docbkx/samples/auth.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth.json
diff --git a/openstack-identity-api/src/docbkx/samples/auth.xml b/openstack-identity-api/v2.0/src/docbkx/samples/auth.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth.xml
diff --git a/openstack-identity-api/src/docbkx/samples/auth_credentials.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth_credentials.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json
diff --git a/openstack-identity-api/src/docbkx/samples/auth_credentials.xml b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth_credentials.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.xml
diff --git a/openstack-identity-api/src/docbkx/samples/auth_with_token.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth_with_token.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth_with_token.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_with_token.json
diff --git a/openstack-identity-api/src/docbkx/samples/auth_with_token.xml b/openstack-identity-api/v2.0/src/docbkx/samples/auth_with_token.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/auth_with_token.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_with_token.xml
diff --git a/openstack-identity-api/src/docbkx/samples/choices.json b/openstack-identity-api/v2.0/src/docbkx/samples/choices.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/choices.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/choices.json
diff --git a/openstack-identity-api/src/docbkx/samples/choices.xml b/openstack-identity-api/v2.0/src/docbkx/samples/choices.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/choices.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/choices.xml
diff --git a/openstack-identity-api/src/docbkx/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/endpoints.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json
diff --git a/openstack-identity-api/src/docbkx/samples/endpoints.xml b/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/endpoints.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/endpoints.xml
diff --git a/openstack-identity-api/src/docbkx/samples/ext-getuser.json b/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/ext-getuser.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json
diff --git a/openstack-identity-api/src/docbkx/samples/ext-getuser.xml b/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/ext-getuser.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.xml
diff --git a/openstack-identity-api/src/docbkx/samples/extension.json b/openstack-identity-api/v2.0/src/docbkx/samples/extension.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/extension.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/extension.json
diff --git a/openstack-identity-api/src/docbkx/samples/extension.xml b/openstack-identity-api/v2.0/src/docbkx/samples/extension.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/extension.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/extension.xml
diff --git a/openstack-identity-api/src/docbkx/samples/extensions.json b/openstack-identity-api/v2.0/src/docbkx/samples/extensions.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/extensions.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/extensions.json
diff --git a/openstack-identity-api/src/docbkx/samples/extensions.xml b/openstack-identity-api/v2.0/src/docbkx/samples/extensions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/extensions.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/extensions.xml
diff --git a/openstack-identity-api/src/docbkx/samples/getuser-1.json b/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/getuser-1.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json
diff --git a/openstack-identity-api/src/docbkx/samples/getuser-1.xml b/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/getuser-1.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.xml
diff --git a/openstack-identity-api/src/docbkx/samples/identity_fault.json b/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/identity_fault.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json
diff --git a/openstack-identity-api/src/docbkx/samples/identity_fault.xml b/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/identity_fault.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.xml
diff --git a/openstack-identity-api/src/docbkx/samples/item_not_found.json b/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/item_not_found.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json
diff --git a/openstack-identity-api/src/docbkx/samples/item_not_found.xml b/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/item_not_found.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.xml
diff --git a/openstack-identity-api/src/docbkx/samples/roles.json b/openstack-identity-api/v2.0/src/docbkx/samples/roles.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/roles.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/roles.json
diff --git a/openstack-identity-api/src/docbkx/samples/roles.xml b/openstack-identity-api/v2.0/src/docbkx/samples/roles.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/roles.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/roles.xml
diff --git a/openstack-identity-api/src/docbkx/samples/samplerequestheader.txt b/openstack-identity-api/v2.0/src/docbkx/samples/samplerequestheader.txt
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/samplerequestheader.txt
rename to openstack-identity-api/v2.0/src/docbkx/samples/samplerequestheader.txt
diff --git a/openstack-identity-api/src/docbkx/samples/sampleresponseheader.txt b/openstack-identity-api/v2.0/src/docbkx/samples/sampleresponseheader.txt
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/sampleresponseheader.txt
rename to openstack-identity-api/v2.0/src/docbkx/samples/sampleresponseheader.txt
diff --git a/openstack-identity-api/src/docbkx/samples/tenant.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenant.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenant.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenant.json
diff --git a/openstack-identity-api/src/docbkx/samples/tenant.xml b/openstack-identity-api/v2.0/src/docbkx/samples/tenant.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenant.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenant.xml
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-1.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-1.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-1.xml b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-1.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.xml
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-2.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-2.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-2.xml b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-2.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.xml
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-3.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-3.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-3.xml b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-3.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.xml
diff --git a/openstack-identity-api/src/docbkx/samples/tenants-request.txt b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-request.txt
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants-request.txt
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants-request.txt
diff --git a/openstack-identity-api/src/docbkx/samples/tenants.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants.json
diff --git a/openstack-identity-api/src/docbkx/samples/tenants.xml b/openstack-identity-api/v2.0/src/docbkx/samples/tenants.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/tenants.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/tenants.xml
diff --git a/openstack-identity-api/src/docbkx/samples/user.json b/openstack-identity-api/v2.0/src/docbkx/samples/user.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/user.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/user.json
diff --git a/openstack-identity-api/src/docbkx/samples/user.xml b/openstack-identity-api/v2.0/src/docbkx/samples/user.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/user.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/user.xml
diff --git a/openstack-identity-api/src/docbkx/samples/validatetoken.json b/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/validatetoken.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json
diff --git a/openstack-identity-api/src/docbkx/samples/validatetoken.xml b/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/validatetoken.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.xml
diff --git a/openstack-identity-api/src/docbkx/samples/version-atom.xml b/openstack-identity-api/v2.0/src/docbkx/samples/version-atom.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/version-atom.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/version-atom.xml
diff --git a/openstack-identity-api/src/docbkx/samples/version.json b/openstack-identity-api/v2.0/src/docbkx/samples/version.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/version.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/version.json
diff --git a/openstack-identity-api/src/docbkx/samples/version.xml b/openstack-identity-api/v2.0/src/docbkx/samples/version.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/version.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/version.xml
diff --git a/openstack-identity-api/src/docbkx/samples/versions-atom.xml b/openstack-identity-api/v2.0/src/docbkx/samples/versions-atom.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/versions-atom.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/versions-atom.xml
diff --git a/openstack-identity-api/src/docbkx/samples/versions.json b/openstack-identity-api/v2.0/src/docbkx/samples/versions.json
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/versions.json
rename to openstack-identity-api/v2.0/src/docbkx/samples/versions.json
diff --git a/openstack-identity-api/src/docbkx/samples/versions.xml b/openstack-identity-api/v2.0/src/docbkx/samples/versions.xml
similarity index 100%
rename from openstack-identity-api/src/docbkx/samples/versions.xml
rename to openstack-identity-api/v2.0/src/docbkx/samples/versions.xml
diff --git a/openstack-identity-api/src/docbkx/style/schema.css b/openstack-identity-api/v2.0/src/docbkx/style/schema.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/schema.css
rename to openstack-identity-api/v2.0/src/docbkx/style/schema.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_acid.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_acid.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_acid.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_acid.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_darkblue.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_darkblue.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_darkblue.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_darkblue.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_emacs.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_emacs.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_emacs.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_emacs.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_night.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_night.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_night.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_night.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_pablo.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_pablo.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_pablo.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_pablo.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_print.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_print.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_print.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_print.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_style.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_style.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_style.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_style.css
diff --git a/openstack-identity-api/src/docbkx/style/shjs/sh_whitengrey.css b/openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_whitengrey.css
similarity index 100%
rename from openstack-identity-api/src/docbkx/style/shjs/sh_whitengrey.css
rename to openstack-identity-api/v2.0/src/docbkx/style/shjs/sh_whitengrey.css
diff --git a/openstack-identity-api/src/docbkx/wadl/HP-IDM-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/HP-IDM-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/HP-IDM-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/HP-IDM-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/OS-KSADM-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSADM-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/OS-KSADM-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSADM-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/OS-KSCATALOG-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSCATALOG-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/OS-KSCATALOG-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSCATALOG-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/OS-KSEC2-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSEC2-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/OS-KSEC2-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSEC2-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/OS-KSS3-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSS3-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/OS-KSS3-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSS3-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/RAX-GRPADM.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-GRPADM.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/RAX-GRPADM.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/RAX-GRPADM.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/RAX-KSGRP.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSGRP.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/RAX-KSGRP.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSGRP.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/RAX-KSKEY-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSKEY-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/RAX-KSKEY-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSKEY-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/RAX-KSQA-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSQA-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/RAX-KSQA-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSQA-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/common.ent b/openstack-identity-api/v2.0/src/docbkx/wadl/common.ent
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/common.ent
rename to openstack-identity-api/v2.0/src/docbkx/wadl/common.ent
diff --git a/openstack-identity-api/src/docbkx/wadl/identity-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/identity-admin.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/identity-admin.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/identity-admin.wadl
diff --git a/openstack-identity-api/src/docbkx/wadl/identity.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/identity.wadl
similarity index 100%
rename from openstack-identity-api/src/docbkx/wadl/identity.wadl
rename to openstack-identity-api/v2.0/src/docbkx/wadl/identity.wadl
diff --git a/openstack-identity-api/src/docbkx/xsd/OS-KSADM.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSADM.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/OS-KSADM.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSADM.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/OS-KSCATALOG.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSCATALOG.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/OS-KSCATALOG.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSCATALOG.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/OS-KSEC2-credentials.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSEC2-credentials.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/OS-KSEC2-credentials.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSEC2-credentials.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/OS-KSS3-credentials.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSS3-credentials.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/OS-KSS3-credentials.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/OS-KSS3-credentials.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/RAX-GRPADM.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/RAX-GRPADM.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/RAX-GRPADM.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/RAX-GRPADM.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/RAX-KSGRP-groups.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSGRP-groups.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/RAX-KSGRP-groups.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSGRP-groups.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/RAX-KSKEY-credentials.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSKEY-credentials.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/RAX-KSKEY-credentials.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSKEY-credentials.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/RAX-KSQA-secretQA.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSQA-secretQA.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/RAX-KSQA-secretQA.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/RAX-KSQA-secretQA.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/api-common.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/api-common.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/api-common.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/api-common.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/api.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/api.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/api.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/api.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/atom/atom.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/atom/atom.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/atom/atom.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/atom/atom.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/atom/xml.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/atom/xml.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/atom/xml.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/atom/xml.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/credentials.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/credentials.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/credentials.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/credentials.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/endpoints.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/endpoints.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/endpoints.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/endpoints.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/extensions.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/extensions.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/extensions.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/extensions.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/fault.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/fault.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/fault.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/fault.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/roles.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/roles.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/roles.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/roles.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/services.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/services.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/services.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/services.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/tenant.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/tenant.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/tenant.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/tenant.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/token.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/token.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/token.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/token.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/user.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/user.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/user.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/user.xsd
diff --git a/openstack-identity-api/src/docbkx/xsd/version.xsd b/openstack-identity-api/v2.0/src/docbkx/xsd/version.xsd
similarity index 100%
rename from openstack-identity-api/src/docbkx/xsd/version.xsd
rename to openstack-identity-api/v2.0/src/docbkx/xsd/version.xsd
diff --git a/openstack-identity-api/src/docbkx/xslt/schema.xslt b/openstack-identity-api/v2.0/src/docbkx/xslt/schema.xslt
similarity index 100%
rename from openstack-identity-api/src/docbkx/xslt/schema.xslt
rename to openstack-identity-api/v2.0/src/docbkx/xslt/schema.xslt
diff --git a/openstack-identity-api/v3/pom.xml b/openstack-identity-api/v3/pom.xml
new file mode 100644
index 00000000..5b181aaf
--- /dev/null
+++ b/openstack-identity-api/v3/pom.xml
@@ -0,0 +1,115 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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-guide</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>OpenStack API Reference</name>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- ################################################ -->
+    
+    <build>
+        <plugins>      
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <version>1.8.0</version>
+                <executions>
+                    <execution>
+                        <id>generate-webhelp</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <!-- These parameters only apply to webhelp -->
+                            <enableDisqus>1</enableDisqus>
+                            <disqusShortname>os-identity-api-3</disqusShortname>
+                            <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                            <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                            <generateToc>
+                                appendix  toc,title
+                                article/appendix  nop
+                                article   toc,title
+                                book      toc,title,figure,table,example,equation
+                                chapter   toc
+                                section   toc
+                                part      toc,title
+                                preface   toc,title
+                                qandadiv  toc
+                                qandaset  toc
+                                reference toc,title
+                                set       toc,title
+                            </generateToc>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                            <tocDepthSection>1</tocDepthSection>
+                            <webhelpDirname>3</webhelpDirname>
+                            <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-identity-service</targetDirectory>
+                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
+                            <pdfFilenameBase>identity-api-ref-3</pdfFilenameBase>         
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>cleanup</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <includes>dummy.xml</includes>
+                            <postProcess>
+                                <delete includeemptydirs="true" verbose="true">
+                                    <fileset dir="${basedir}/target/docbkx" >
+                                        <include name="**/*"/>
+                                        <exclude name="webhelp/**"/>
+                                    </fileset>
+                                </delete>
+                            </postProcess>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- These parameters apply to pdf and webhelp -->
+                    <xincludeSupported>true</xincludeSupported>
+                    <sourceDirectory>.</sourceDirectory>
+                    <includes>
+                        identity-api-v3.xml
+                    </includes>
+                    <profileSecurity>reviewer</profileSecurity>
+                    <branding>openstack</branding>
+                </configuration>         
+            </plugin>    
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>Rackspace Research Repositories</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>rackspace-research</id>
+                    <name>Rackspace Research Repository</name>
+                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>rackspace-research</id>
+                    <name>Rackspace Research Repository</name>
+                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+</project>
diff --git a/openstack-identity-api/src/markdown/identity-api-v3-os-inherit-ext.md b/openstack-identity-api/v3/src/markdown/identity-api-v3-os-inherit-ext.md
similarity index 100%
rename from openstack-identity-api/src/markdown/identity-api-v3-os-inherit-ext.md
rename to openstack-identity-api/v3/src/markdown/identity-api-v3-os-inherit-ext.md
diff --git a/openstack-identity-api/src/markdown/identity-api-v3-os-trust-ext.md b/openstack-identity-api/v3/src/markdown/identity-api-v3-os-trust-ext.md
similarity index 100%
rename from openstack-identity-api/src/markdown/identity-api-v3-os-trust-ext.md
rename to openstack-identity-api/v3/src/markdown/identity-api-v3-os-trust-ext.md
diff --git a/openstack-identity-api/src/markdown/identity-api-v3.md b/openstack-identity-api/v3/src/markdown/identity-api-v3.md
similarity index 100%
rename from openstack-identity-api/src/markdown/identity-api-v3.md
rename to openstack-identity-api/v3/src/markdown/identity-api-v3.md