diff --git a/openstack-image-service-api/src/docbkx/imageapioverview.xml b/doc/image-api-v1/imageapioverview.xml
similarity index 100%
rename from openstack-image-service-api/src/docbkx/imageapioverview.xml
rename to doc/image-api-v1/imageapioverview.xml
diff --git a/openstack-image-service-api/src/docbkx/imagesapi.xml b/doc/image-api-v1/imagesapi.xml
similarity index 100%
rename from openstack-image-service-api/src/docbkx/imagesapi.xml
rename to doc/image-api-v1/imagesapi.xml
diff --git a/openstack-image-service-api/src/docbkx/imagesapigeneralinfo.xml b/doc/image-api-v1/imagesapigeneralinfo.xml
similarity index 100%
rename from openstack-image-service-api/src/docbkx/imagesapigeneralinfo.xml
rename to doc/image-api-v1/imagesapigeneralinfo.xml
diff --git a/openstack-image-service-api/src/docbkx/os-image-service-devguide.xml b/doc/image-api-v1/os-image-service-devguide.xml
similarity index 100%
rename from openstack-image-service-api/src/docbkx/os-image-service-devguide.xml
rename to doc/image-api-v1/os-image-service-devguide.xml
diff --git a/doc/image-api-v1/pom.xml b/doc/image-api-v1/pom.xml
new file mode 100644
index 0000000..6d31e89
--- /dev/null
+++ b/doc/image-api-v1/pom.xml
@@ -0,0 +1,79 @@
+<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">
+    <parent>
+        <groupId>org.openstack.docs</groupId>
+        <artifactId>parent-pom</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openstack-image-api-v1</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenStack Image Service API v1 Reference</name>
+    <properties>
+        <!-- This is set by Jenkins according to the branch. -->
+        <release.path.name>local</release.path.name>
+        <comments.enabled>1</comments.enabled>
+    </properties>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- ################################################ -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <!-- version is set in ../pom.xml file -->
+                <executions>
+                    <!-- Configuration for OpenStack Image Service API v1 Reference -->
+                    <execution>
+                        <id>generate-webhelp</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <includes> os-image-service-devguide.xml </includes>
+                            <generateToc>
+                                appendix  toc,title
+                                article/appendix  nop
+                                article   toc,title
+                                book      toc,title,figure,table,example,equation
+                                chapter   toc,title
+                                section   toc
+                                part      toc,title
+                                qandadiv  toc
+                                qandaset  toc
+                                reference toc,title
+                                set       toc,title
+                            </generateToc>
+                            <webhelpDirname>1.1</webhelpDirname>
+                            <pdfFilenameBase>openstack-image-service</pdfFilenameBase>
+                            <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-image-service</targetDirectory>
+                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <chapterAutolabel>1</chapterAutolabel>
+                    <sectionAutolabel>0</sectionAutolabel>
+                    <tocSectionDepth>1</tocSectionDepth>
+                    <formalProcedures>0</formalProcedures>
+                    <highlightSource>false</highlightSource>
+                    <xincludeSupported>true</xincludeSupported>
+                    <showXslMessages>true</showXslMessages>
+                    <sourceDirectory>.</sourceDirectory>
+                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
+                    <branding>openstack</branding>
+                    <enableDisqus>1</enableDisqus>
+                    <disqusShortname>openstackdocs</disqusShortname>
+                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                    <suppressFooterNavigation>0</suppressFooterNavigation>
+                    <canonicalUrlBase>http://docs.openstack.org/api/openstack-image-service/content/</canonicalUrlBase>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/openstack-image-service-api/src/markdown/image-api-v2.0.md b/doc/image-api-v2/image-api-v2.0.md
similarity index 100%
rename from openstack-image-service-api/src/markdown/image-api-v2.0.md
rename to doc/image-api-v2/image-api-v2.0.md
diff --git a/doc/image-api-v2/pom.xml b/doc/image-api-v2/pom.xml
new file mode 100644
index 0000000..71723c7
--- /dev/null
+++ b/doc/image-api-v2/pom.xml
@@ -0,0 +1,80 @@
+<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">
+    <parent>
+        <groupId>org.openstack.docs</groupId>
+        <artifactId>parent-pom</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openstack-image-api-v2</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenStack Image Service API v2 Reference</name>
+    <properties>
+        <!-- This is set by Jenkins according to the branch. -->
+        <release.path.name>local</release.path.name>
+        <comments.enabled>1</comments.enabled>
+    </properties>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- ################################################ -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <!-- version is set in ../pom.xml file -->
+                <executions>
+                    <!-- Configuration for OpenStack Image Service API v1 Reference -->
+                    <execution>
+                        <id>generate-webhelp</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <includes> image-api-v2.0.xml </includes>
+                            <generateToc>
+                                appendix  toc,title
+                                article/appendix  nop
+                                article   toc,title
+                                book      toc,title,figure,table,example,equation
+                                chapter   toc,title
+                                section   toc
+                                part      toc,title
+                                qandadiv  toc
+                                qandaset  toc
+                                reference toc,title
+                                set       toc,title
+                            </generateToc>
+                            <webhelpDirname>2.0</webhelpDirname>
+                            <pdfFilenameBase>openstack-image-service</pdfFilenameBase>
+                            <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-image-service</targetDirectory>
+                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <chapterAutolabel>1</chapterAutolabel>
+                    <sectionAutolabel>0</sectionAutolabel>
+                    <tocSectionDepth>1</tocSectionDepth>
+                    <formalProcedures>0</formalProcedures>
+                    <highlightSource>false</highlightSource>
+                    <xincludeSupported>true</xincludeSupported>
+                    <showXslMessages>true</showXslMessages>
+                    <sourceDirectory>.</sourceDirectory>
+                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
+                    <branding>openstack</branding>
+                    <enableDisqus>1</enableDisqus>
+                    <disqusShortname>openstackdocs</disqusShortname>
+                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                    <suppressFooterNavigation>0</suppressFooterNavigation>
+                    <canonicalUrlBase>http://docs.openstack.org/api/openstack-image-service/content/</canonicalUrlBase>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/doc/pom.xml b/doc/pom.xml
new file mode 100644
index 0000000..8034837
--- /dev/null
+++ b/doc/pom.xml
@@ -0,0 +1,46 @@
+<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>parent-pom</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>image-api-v1</module>
+    <module>image-api-v2</module>
+  </modules>
+  <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>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.rackspace.cloud.api</groupId>
+        <artifactId>clouddocs-maven-plugin</artifactId>
+        <version>1.13.0</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/openstack-image-service-api/pom.xml b/openstack-image-service-api/pom.xml
deleted file mode 100644
index c5f24b0..0000000
--- a/openstack-image-service-api/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<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.13.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>openstackdocs</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
-                                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>
-                            <tocSectionDepth>1</tocSectionDepth>
-                            <webhelpDirname>1.1</webhelpDirname>
-                            <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-image-service</targetDirectory>
-                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
-                            <pdfFilenameBase>os-image-service-devguide-1.1</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>src/docbkx</sourceDirectory>
-                    <includes>
-                        os-image-service-devguide.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-image-service-api/src/markdown/pom.xml b/openstack-image-service-api/src/markdown/pom.xml
deleted file mode 100644
index 33c584c..0000000
--- a/openstack-image-service-api/src/markdown/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<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.13.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-image-api-20</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>2.0</webhelpDirname>
-                            <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-image-service</targetDirectory>
-                            <includeDateInPdfFilename>0</includeDateInPdfFilename>
-                            <pdfFilenameBase>os-image-service-devguide-2.0</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>
-                        image-api-v2.0.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>