Revert "514210: Publish EPUB artifacts to Maven Central"

This reverts commit c42022c8b9c6b5b9559336a84d3f10221d4806eb.

Change-Id: Ic5d076b6353f7d55afe43801d364ae4074b9a0da
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=514210
diff --git a/docs-pom.xml b/docs-pom.xml
index 1a574cd..1127f2c5 100644
--- a/docs-pom.xml
+++ b/docs-pom.xml
@@ -70,7 +70,7 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>remove-from-p2-index</id>
+                        <id>remove-wikitext-from-p2-index</id>
                         <phase>generate-sources</phase>
                         <configuration>
                             <target>
@@ -80,10 +80,6 @@
                                     <regexp pattern="^p2\.osgi\.bundle\:org\.eclipse\.mylyn\.wikitext\..*$"/>
                                     <substitution expression=""/>
                                 </replaceregexp>
-                                <replaceregexp file="${p2-index-file}" flags="gm">
-                                    <regexp pattern="^p2\.osgi\.bundle\:org\.eclipse\.mylyn\.docs.epub\..*$"/>
-                                    <substitution expression=""/>
-                                </replaceregexp>
                                 <delete includeemptydirs="true">
                                     <fileset dir="${p2.repo.local}" defaultexcludes="false">
                                         <include name="org/eclipse/mylyn/docs/**"/>
@@ -94,12 +90,6 @@
                                     <fileset dir="${p2.repo.local}" defaultexcludes="false">
                                         <include name="p2/osgi/bundle/org.eclipse.mylyn.wikitext*/**"/>
                                     </fileset>
-                                    <fileset dir="${p2.repo.local}" defaultexcludes="false">
-                                        <include name="p2/org/eclipse/update/feature/org.eclipse.mylyn.docs.epub*/**"/>
-                                    </fileset>
-                                    <fileset dir="${p2.repo.local}" defaultexcludes="false">
-                                        <include name="p2/osgi/bundle/org.eclipse.mylyn.docs.epub*/**"/>
-                                    </fileset>
                                 </delete>
                             </target>
                         </configuration>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/.project b/docs/org.eclipse.mylyn.docs.epub-feature/.project
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/.project
rename to docs/org.eclipse.mylyn.docs.epub-feature/.project
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.runtime.prefs
rename to docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.team.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub-feature/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties b/docs/org.eclipse.mylyn.docs.epub-feature/build.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/build.properties
rename to docs/org.eclipse.mylyn.docs.epub-feature/build.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties b/docs/org.eclipse.mylyn.docs.epub-feature/feature.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.properties
rename to docs/org.eclipse.mylyn.docs.epub-feature/feature.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml b/docs/org.eclipse.mylyn.docs.epub-feature/feature.xml
similarity index 96%
rename from epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml
rename to docs/org.eclipse.mylyn.docs.epub-feature/feature.xml
index 4585a07..1e9236f 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub-feature/feature.xml
+++ b/docs/org.eclipse.mylyn.docs.epub-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.mylyn.docs.epub"
       label="%featureName"
-      version="4.0.0.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.docs.epub.core"
       license-feature="org.eclipse.license"
diff --git a/docs/org.eclipse.mylyn.docs.epub-feature/pom.xml b/docs/org.eclipse.mylyn.docs.epub-feature/pom.xml
new file mode 100644
index 0000000..de23182
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub-feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.mylyn.docs-parent</artifactId>
+    <groupId>org.eclipse.mylyn.docs</groupId>
+    <version>2.11.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.mylyn.docs.epub</artifactId>
+  <version>3.2.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+  <groupId>org.eclipse.mylyn.docs.epub</groupId>
+</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.classpath b/docs/org.eclipse.mylyn.docs.epub.ant.core/.classpath
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/.classpath
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/.classpath
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.gitignore b/docs/org.eclipse.mylyn.docs.epub.ant.core/.gitignore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/.gitignore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.jdt.core.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.pde.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.pde.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
copy from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs
copy to docs/org.eclipse.mylyn.docs.epub.ant.core/.settings/org.eclipse.wst.validation.prefs
diff --git a/docs/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF b/docs/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ef658d3
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.ant.core;singleton:=true
+Bundle-Version: 2.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.mylyn.docs.epub.ant;x-internal:=true,
+ org.eclipse.mylyn.docs.epub.ant.core;uses:="org.eclipse.mylyn.docs.epub,org.apache.tools.ant.types,org.apache.tools.ant"
+Require-Bundle: org.apache.ant;bundle-version="1.7.0",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="1.0.0",
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore
+Bundle-ClassPath: .
+Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.docs.epub.ant.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/OSGI-INF/l10n/bundle.properties
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/OSGI-INF/l10n/bundle.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/about.html b/docs/org.eclipse.mylyn.docs.epub.ant.core/about.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/about.html
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/about.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties b/docs/org.eclipse.mylyn.docs.epub.ant.core/build.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/build.properties
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/build.properties
diff --git a/docs/org.eclipse.mylyn.docs.epub.ant.core/pom.xml b/docs/org.eclipse.mylyn.docs.epub.ant.core/pom.xml
new file mode 100644
index 0000000..b444339
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.ant.core/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.mylyn.docs-parent</artifactId>
+    <groupId>org.eclipse.mylyn.docs</groupId>
+    <version>2.11.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.mylyn.docs.epub.ant.core</artifactId>
+  <version>2.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <groupId>org.eclipse.mylyn.docs.epub</groupId>
+</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/AntLogger.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ContributorType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CoverType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CoverageType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/CreatorType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/DateType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
index 9029c55..29fea40 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
+++ b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/EpubTask.java
@@ -20,8 +20,8 @@
 import org.apache.tools.ant.Task;
 import org.eclipse.mylyn.docs.epub.core.EPUB;
 import org.eclipse.mylyn.docs.epub.core.OPSPublication;
-import org.eclipse.mylyn.docs.epub.internal.EclipseTocImporter;
 import org.eclipse.mylyn.docs.epub.opf.Role;
+import org.eclipse.mylyn.internal.docs.epub.core.EclipseTocImporter;
 
 /**
  * Assemble a new EPUB.
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/FileSetType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/FormatType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/IdentifierType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ImportType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ItemType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/LanguageType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/MetaType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/PublisherType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/ReferenceType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/RelationType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/RightsType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/SourceType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/SubjectType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TitleType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TocType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/TypeType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/tasks.xml b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/tasks.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/core/tasks.xml
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/core/tasks.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties b/docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.ant/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
rename to docs/org.eclipse.mylyn.docs.epub.ant.core/src/org/eclipse/mylyn/docs/epub/ant/tasks.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.classpath b/docs/org.eclipse.mylyn.docs.epub.core/.classpath
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.classpath
rename to docs/org.eclipse.mylyn.docs.epub.core/.classpath
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.gitignore b/docs/org.eclipse.mylyn.docs.epub.core/.gitignore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.core/.gitignore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.project b/docs/org.eclipse.mylyn.docs.epub.core/.project
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.project
rename to docs/org.eclipse.mylyn.docs.epub.core/.project
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.core.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.pde.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs
rename to docs/org.eclipse.mylyn.docs.epub.core/.settings/org.eclipse.wst.validation.prefs
diff --git a/docs/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF b/docs/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f6f478f
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF
@@ -0,0 +1,92 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.core;singleton:=true
+Bundle-Version: 3.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.5.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
+ org.eclipse.emf.common;bundle-version="2.5.0",
+ org.eclipse.mylyn.wikitext;bundle-version="3.0.0",
+ org.apache.tika.core;bundle-version="1.3.0",
+ org.apache.tika.parsers;bundle-version="1.3.0"
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.mylyn.docs.epub.core;
+  uses:="org.eclipse.mylyn.docs.epub.dc,
+   org.eclipse.mylyn.docs.epub.opf,
+   org.eclipse.mylyn.docs.epub.ncx",
+ org.eclipse.mylyn.docs.epub.core.wikitext,
+ org.eclipse.mylyn.docs.epub.dc;
+  uses:="org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.mylyn.docs.epub.opf",
+ org.eclipse.mylyn.docs.epub.dc.impl;
+  uses:="org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.mylyn.docs.epub.opf,
+   org.eclipse.mylyn.docs.epub.dc,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify",
+ org.eclipse.mylyn.docs.epub.dc.util;
+  uses:="org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.mylyn.docs.epub.dc",
+ org.eclipse.mylyn.docs.epub.ncx;
+  uses:="org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
+ org.eclipse.mylyn.docs.epub.ncx.impl;
+  uses:="org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.mylyn.docs.epub.ncx",
+ org.eclipse.mylyn.docs.epub.ncx.util;
+  uses:="org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.mylyn.docs.epub.ncx,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.common.notify.impl",
+ org.eclipse.mylyn.docs.epub.ocf,
+ org.eclipse.mylyn.docs.epub.ocf.impl,
+ org.eclipse.mylyn.docs.epub.ocf.util,
+ org.eclipse.mylyn.docs.epub.opf;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.mylyn.docs.epub.dc",
+ org.eclipse.mylyn.docs.epub.opf.impl;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.mylyn.docs.epub.dc,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.mylyn.docs.epub.opf",
+ org.eclipse.mylyn.docs.epub.opf.util;
+  uses:="org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.mylyn.docs.epub.opf,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.common.notify.impl",
+ org.eclipse.mylyn.internal.docs.epub.core;x-internal:=true
+Bundle-ClassPath: .
+Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.docs.epub.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/OSGI-INF/l10n/bundle.properties
rename to docs/org.eclipse.mylyn.docs.epub.core/OSGI-INF/l10n/bundle.properties
diff --git a/docs/org.eclipse.mylyn.docs.epub.core/README.txt b/docs/org.eclipse.mylyn.docs.epub.core/README.txt
new file mode 100644
index 0000000..92e1122
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.core/README.txt
@@ -0,0 +1,4 @@
+Note that externalisation of strings in types contained within this bundle is
+done using standard Java instead of NLS which is common elsewhere in Mylyn.
+This is done to avoid having dependencies on OSGi since the Ant task for
+handling EPUBs also use these types.
\ No newline at end of file
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/about.html b/docs/org.eclipse.mylyn.docs.epub.core/about.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/about.html
rename to docs/org.eclipse.mylyn.docs.epub.core/about.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/about.ini b/docs/org.eclipse.mylyn.docs.epub.core/about.ini
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/about.ini
rename to docs/org.eclipse.mylyn.docs.epub.core/about.ini
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/build.ant b/docs/org.eclipse.mylyn.docs.epub.core/build.ant
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/build.ant
rename to docs/org.eclipse.mylyn.docs.epub.core/build.ant
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/build.properties b/docs/org.eclipse.mylyn.docs.epub.core/build.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/build.properties
rename to docs/org.eclipse.mylyn.docs.epub.core/build.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/feature.gif b/docs/org.eclipse.mylyn.docs.epub.core/feature.gif
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/feature.gif
rename to docs/org.eclipse.mylyn.docs.epub.core/feature.gif
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/.gitignore b/docs/org.eclipse.mylyn.docs.epub.core/model/.gitignore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.core/model/.gitignore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/dc.ecore b/docs/org.eclipse.mylyn.docs.epub.core/model/dc.ecore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/dc.ecore
rename to docs/org.eclipse.mylyn.docs.epub.core/model/dc.ecore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/ncx.ecore b/docs/org.eclipse.mylyn.docs.epub.core/model/ncx.ecore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/ncx.ecore
rename to docs/org.eclipse.mylyn.docs.epub.core/model/ncx.ecore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/ncx.genmodel b/docs/org.eclipse.mylyn.docs.epub.core/model/ncx.genmodel
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/ncx.genmodel
rename to docs/org.eclipse.mylyn.docs.epub.core/model/ncx.genmodel
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/ocf.ecore b/docs/org.eclipse.mylyn.docs.epub.core/model/ocf.ecore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/ocf.ecore
rename to docs/org.eclipse.mylyn.docs.epub.core/model/ocf.ecore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/ocf.genmodel b/docs/org.eclipse.mylyn.docs.epub.core/model/ocf.genmodel
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/ocf.genmodel
rename to docs/org.eclipse.mylyn.docs.epub.core/model/ocf.genmodel
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/opf.ecore b/docs/org.eclipse.mylyn.docs.epub.core/model/opf.ecore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/opf.ecore
rename to docs/org.eclipse.mylyn.docs.epub.core/model/opf.ecore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/opf.genmodel b/docs/org.eclipse.mylyn.docs.epub.core/model/opf.genmodel
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/opf.genmodel
rename to docs/org.eclipse.mylyn.docs.epub.core/model/opf.genmodel
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant b/docs/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
rename to docs/org.eclipse.mylyn.docs.epub.core/model/relacode.ant
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src b/docs/org.eclipse.mylyn.docs.epub.core/model/relacode.src
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/model/relacode.src
rename to docs/org.eclipse.mylyn.docs.epub.core/model/relacode.src
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/plugin.xml b/docs/org.eclipse.mylyn.docs.epub.core/plugin.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/plugin.xml
rename to docs/org.eclipse.mylyn.docs.epub.core/plugin.xml
diff --git a/docs/org.eclipse.mylyn.docs.epub.core/pom.xml b/docs/org.eclipse.mylyn.docs.epub.core/pom.xml
new file mode 100644
index 0000000..a9484be
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.core/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.mylyn.docs-parent</artifactId>
+    <groupId>org.eclipse.mylyn.docs</groupId>
+    <version>2.11.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.mylyn.docs.epub.core</artifactId>
+  <version>3.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <properties>
+    <target-version>${alt-target-version}</target-version>
+    <platform-repository-url>${alt-platform-repository-url}</platform-repository-url>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <groupId>org.eclipse.mylyn.docs.epub</groupId>
+</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Contributor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Contributor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Contributor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Contributor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Coverage.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Coverage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Coverage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Coverage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Creator.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Creator.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Creator.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Creator.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCPackage.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCPackage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCPackage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCPackage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCType.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCType.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/DCType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Date.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Date.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Date.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Date.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Description.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Description.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Description.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Description.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Format.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Format.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Format.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Format.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Identifier.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Identifier.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Identifier.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Identifier.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Language.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Language.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Language.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Language.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/LocalizedDCType.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/LocalizedDCType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/LocalizedDCType.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/LocalizedDCType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Publisher.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Publisher.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Publisher.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Publisher.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Relation.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Relation.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Relation.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Relation.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Rights.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Rights.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Rights.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Rights.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Source.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Source.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Source.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Source.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Subject.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Subject.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Subject.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Subject.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Title.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Title.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Title.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Title.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Type.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Type.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Type.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/Type.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/ContributorImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/ContributorImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/ContributorImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/ContributorImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CoverageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CoverageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CoverageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CoverageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CreatorImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CreatorImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CreatorImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/CreatorImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCPackageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCPackageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCPackageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCPackageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCTypeImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCTypeImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCTypeImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DCTypeImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DateImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DateImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DateImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DateImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DescriptionImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DescriptionImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DescriptionImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/DescriptionImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/FormatImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/FormatImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/FormatImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/FormatImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/IdentifierImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/IdentifierImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/IdentifierImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/IdentifierImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LanguageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LanguageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LanguageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LanguageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LocalizedDCTypeImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LocalizedDCTypeImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LocalizedDCTypeImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/LocalizedDCTypeImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/PublisherImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/PublisherImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/PublisherImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/PublisherImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RelationImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RelationImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RelationImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RelationImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RightsImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RightsImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RightsImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/RightsImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SourceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SourceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SourceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SourceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SubjectImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SubjectImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SubjectImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/SubjectImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TitleImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TitleImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TitleImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TitleImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TypeImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TypeImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TypeImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/impl/TypeImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCAdapterFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCAdapterFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCAdapterFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCAdapterFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCResourceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCSwitch.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCSwitch.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCSwitch.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCSwitch.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCXMLProcessor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCXMLProcessor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCXMLProcessor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/dc/util/DCXMLProcessor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Audio.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Audio.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Audio.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Audio.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/BookStruct.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/BookStruct.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/BookStruct.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/BookStruct.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Content.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Content.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Content.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Content.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DefaultState.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DefaultState.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DefaultState.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DefaultState.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DirType.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DirType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DirType.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DirType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocAuthor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocAuthor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocAuthor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocAuthor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocTitle.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocTitle.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocTitle.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/DocTitle.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Head.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Head.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Head.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Head.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Img.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Img.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Img.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Img.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Meta.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Meta.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Meta.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Meta.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXPackage.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXPackage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXPackage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NCXPackage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavInfo.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavInfo.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavInfo.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavInfo.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavLabel.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavLabel.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavLabel.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavLabel.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavList.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavList.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavList.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavList.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavMap.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavMap.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavMap.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavMap.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavPoint.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavPoint.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavPoint.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavPoint.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavTarget.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavTarget.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavTarget.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/NavTarget.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Ncx.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Ncx.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Ncx.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Ncx.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/OverrideType.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/OverrideType.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/OverrideType.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/OverrideType.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageList.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageList.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageList.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageList.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageTarget.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageTarget.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageTarget.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/PageTarget.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/SmilCustomTest.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/SmilCustomTest.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/SmilCustomTest.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/SmilCustomTest.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Text.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Text.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Text.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Text.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Type.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Type.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Type.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/Type.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/AudioImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/AudioImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/AudioImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/AudioImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ContentImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ContentImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ContentImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ContentImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocAuthorImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocAuthorImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocAuthorImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocAuthorImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocTitleImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocTitleImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocTitleImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/DocTitleImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/HeadImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/HeadImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/HeadImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/HeadImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ImgImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ImgImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ImgImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/ImgImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/MetaImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/MetaImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/MetaImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/MetaImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXPackageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXPackageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXPackageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NCXPackageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavInfoImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavInfoImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavInfoImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavInfoImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavLabelImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavLabelImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavLabelImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavLabelImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavListImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavListImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavListImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavListImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavMapImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavMapImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavMapImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavMapImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavPointImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavPointImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavPointImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavPointImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavTargetImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavTargetImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavTargetImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NavTargetImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NcxImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NcxImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NcxImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/NcxImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageListImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageListImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageListImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageListImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageTargetImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageTargetImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageTargetImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/PageTargetImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/SmilCustomTestImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/SmilCustomTestImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/SmilCustomTestImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/SmilCustomTestImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/TextImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/TextImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/TextImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/impl/TextImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXAdapterFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXAdapterFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXAdapterFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXAdapterFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXResourceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXSwitch.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXSwitch.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXSwitch.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXSwitch.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXXMLProcessor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXXMLProcessor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXXMLProcessor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ncx/util/NCXXMLProcessor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/Container.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/Container.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/Container.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/Container.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFPackage.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFPackage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFPackage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/OCFPackage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFile.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFile.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFile.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFile.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFiles.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFiles.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFiles.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/RootFiles.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/ContainerImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/ContainerImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/ContainerImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/ContainerImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFPackageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFPackageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFPackageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/OCFPackageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFileImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFileImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFileImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFileImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFilesImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFilesImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFilesImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/impl/RootFilesImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFAdapterFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFAdapterFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFAdapterFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFAdapterFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFResourceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFSwitch.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFSwitch.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFSwitch.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFSwitch.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFXMLProcessor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFXMLProcessor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFXMLProcessor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/ocf/util/OCFXMLProcessor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Guide.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Guide.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Guide.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Guide.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Item.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Item.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Item.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Item.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Itemref.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Itemref.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Itemref.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Itemref.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Manifest.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Manifest.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Manifest.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Manifest.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Meta.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Meta.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Meta.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Meta.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Metadata.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Metadata.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Metadata.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Metadata.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFPackage.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFPackage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFPackage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/OPFPackage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Package.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Package.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Package.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Package.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Reference.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Reference.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Reference.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Reference.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Role.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Role.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Role.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Role.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Spine.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Spine.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Spine.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Spine.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Tours.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Tours.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Tours.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Tours.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Type.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Type.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Type.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/Type.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/GuideImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/GuideImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/GuideImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/GuideImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemrefImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemrefImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemrefImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ItemrefImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ManifestImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ManifestImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ManifestImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ManifestImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetaImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetaImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetaImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetaImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetadataImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetadataImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetadataImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/MetadataImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFPackageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFPackageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFPackageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/OPFPackageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/PackageImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/PackageImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/PackageImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/PackageImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ReferenceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ReferenceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ReferenceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ReferenceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/SpineImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/SpineImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/SpineImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/SpineImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ToursImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ToursImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ToursImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/impl/ToursImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFAdapterFactory.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFAdapterFactory.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFAdapterFactory.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFAdapterFactory.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceFactoryImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceFactoryImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceFactoryImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceFactoryImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceImpl.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceImpl.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceImpl.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFResourceImpl.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFSwitch.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFSwitch.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFSwitch.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFSwitch.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFValidator.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFValidator.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFValidator.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFValidator.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFXMLProcessor.java b/docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFXMLProcessor.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFXMLProcessor.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src-gen/org/eclipse/mylyn/docs/epub/opf/util/OPFXMLProcessor.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
similarity index 99%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
index 8252eb6..4a96778 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUB.java
@@ -35,13 +35,13 @@
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
 import org.eclipse.mylyn.docs.epub.core.ILogger.Severity;
-import org.eclipse.mylyn.docs.epub.internal.EPUBFileUtil;
 import org.eclipse.mylyn.docs.epub.ocf.Container;
 import org.eclipse.mylyn.docs.epub.ocf.OCFFactory;
 import org.eclipse.mylyn.docs.epub.ocf.OCFPackage;
 import org.eclipse.mylyn.docs.epub.ocf.RootFile;
 import org.eclipse.mylyn.docs.epub.ocf.RootFiles;
 import org.eclipse.mylyn.docs.epub.ocf.util.OCFResourceImpl;
+import org.eclipse.mylyn.internal.docs.epub.core.EPUBFileUtil;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.DefaultHandler2;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/EPUBPublication.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ILogger.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Messages.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
index 26b0c7f..fbe4efc 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/OPSPublication.java
@@ -32,9 +32,6 @@
 import org.eclipse.emf.ecore.xmi.XMLHelper;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.mylyn.docs.epub.core.ILogger.Severity;
-import org.eclipse.mylyn.docs.epub.internal.EPUBXMLHelperImp;
-import org.eclipse.mylyn.docs.epub.internal.OPSValidator;
-import org.eclipse.mylyn.docs.epub.internal.TOCGenerator;
 import org.eclipse.mylyn.docs.epub.ncx.DocTitle;
 import org.eclipse.mylyn.docs.epub.ncx.Head;
 import org.eclipse.mylyn.docs.epub.ncx.Meta;
@@ -52,6 +49,9 @@
 import org.eclipse.mylyn.docs.epub.opf.Metadata;
 import org.eclipse.mylyn.docs.epub.opf.OPFFactory;
 import org.eclipse.mylyn.docs.epub.opf.Spine;
+import org.eclipse.mylyn.internal.docs.epub.core.EPUBXMLHelperImp;
+import org.eclipse.mylyn.internal.docs.epub.core.OPSValidator;
+import org.eclipse.mylyn.internal.docs.epub.core.TOCGenerator;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
similarity index 99%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
index 333c8a4..2461afe 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/Publication.java
@@ -59,9 +59,6 @@
 import org.eclipse.mylyn.docs.epub.dc.Source;
 import org.eclipse.mylyn.docs.epub.dc.Subject;
 import org.eclipse.mylyn.docs.epub.dc.Title;
-import org.eclipse.mylyn.docs.epub.internal.EPUBFileUtil;
-import org.eclipse.mylyn.docs.epub.internal.EPUBXMLHelperImp;
-import org.eclipse.mylyn.docs.epub.internal.ReferenceScanner;
 import org.eclipse.mylyn.docs.epub.opf.Item;
 import org.eclipse.mylyn.docs.epub.opf.Itemref;
 import org.eclipse.mylyn.docs.epub.opf.OPFFactory;
@@ -73,6 +70,9 @@
 import org.eclipse.mylyn.docs.epub.opf.Type;
 import org.eclipse.mylyn.docs.epub.opf.util.OPFResourceImpl;
 import org.eclipse.mylyn.docs.epub.opf.util.OPFValidator;
+import org.eclipse.mylyn.internal.docs.epub.core.EPUBFileUtil;
+import org.eclipse.mylyn.internal.docs.epub.core.EPUBXMLHelperImp;
+import org.eclipse.mylyn.internal.docs.epub.core.ReferenceScanner;
 import org.xml.sax.SAXException;
 
 /**
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/PublicationProxy.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationException.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/ValidationMessage.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/messages.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/core/wikitext/MarkupToOPS.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/AbstractXHTMLScanner.java
similarity index 97%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/AbstractXHTMLScanner.java
index accaaed..c508261 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/AbstractXHTMLScanner.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/AbstractXHTMLScanner.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBFileUtil.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBFileUtil.java
index af790be..adc18b0 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBFileUtil.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBFileUtil.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBXMLHelperImp.java
similarity index 92%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBXMLHelperImp.java
index 8f1f706..9915fa5 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EPUBXMLHelperImp.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EPUBXMLHelperImp.java
@@ -8,7 +8,7 @@
  * 
  * Contributors: Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
 
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EclipseTocImporter.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EclipseTocImporter.java
index 293fa1b..72712e7 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/EclipseTocImporter.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/EclipseTocImporter.java
@@ -9,7 +9,7 @@
  *     Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/MetadataScanner.java
similarity index 97%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/MetadataScanner.java
index 8b9cbbb..7a589b6 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/MetadataScanner.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/MetadataScanner.java
@@ -8,7 +8,7 @@
  * 
  * Contributors: Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.IOException;
 
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/OPSValidator.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/OPSValidator.java
index 90838d5..32474bc 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/OPSValidator.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/OPSValidator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.IOException;
 import java.text.MessageFormat;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/ReferenceScanner.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/ReferenceScanner.java
index f2887be..01c0246 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/ReferenceScanner.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/ReferenceScanner.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/TOCGenerator.java
similarity index 98%
rename from epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java
rename to docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/TOCGenerator.java
index 82c6157..48ebbfb 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/docs/epub/internal/TOCGenerator.java
+++ b/docs/org.eclipse.mylyn.docs.epub.core/src/org/eclipse/mylyn/internal/docs/epub/core/TOCGenerator.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.docs.epub.internal;
+package org.eclipse.mylyn.internal.docs.epub.core;
 
 import java.io.IOException;
 
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.classpath b/docs/org.eclipse.mylyn.docs.epub.help/.classpath
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.classpath
rename to docs/org.eclipse.mylyn.docs.epub.help/.classpath
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.gitignore b/docs/org.eclipse.mylyn.docs.epub.help/.gitignore
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.help/.gitignore
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.project b/docs/org.eclipse.mylyn.docs.epub.help/.project
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.project
rename to docs/org.eclipse.mylyn.docs.epub.help/.project
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.runtime.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.core.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.core.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.jdt.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.team.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.help/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF b/docs/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
similarity index 90%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
rename to docs/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
index fd01ad2..63e5354 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.help;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.docs.epub.help/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/OSGI-INF/l10n/bundle.properties
rename to docs/org.eclipse.mylyn.docs.epub.help/OSGI-INF/l10n/bundle.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/about.html b/docs/org.eclipse.mylyn.docs.epub.help/about.html
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/about.html
rename to docs/org.eclipse.mylyn.docs.epub.help/about.html
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/book.css b/docs/org.eclipse.mylyn.docs.epub.help/book.css
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/book.css
rename to docs/org.eclipse.mylyn.docs.epub.help/book.css
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant b/docs/org.eclipse.mylyn.docs.epub.help/build-book.ant
similarity index 84%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant
rename to docs/org.eclipse.mylyn.docs.epub.help/build-book.ant
index ee6de52..b38f78b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-book.ant
+++ b/docs/org.eclipse.mylyn.docs.epub.help/build-book.ant
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2014, 2017 Torkild U. Resheim
+    Copyright (c) 2014 Torkild U. Resheim
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
     which accompanies this distribution, and is available at
@@ -14,15 +14,15 @@
 <project name="Build User Guide EPUB" basedir="." default="build">
 
 	<echo message="${compile_classpath}"/>
-	<path id="epub.ant.classpath">
+	<path id="wikitext.ant.classpath">
 		<pathelement path="${compile_classpath}"/>
 		<pathelement location="../org.eclipse.mylyn.docs.epub.core/@dot"/>
 		<pathelement location="../org.eclipse.mylyn.docs.epub.core/bin"/>
-		<pathelement location="../org.eclipse.mylyn.docs.epub.ant/@dot"/>
-		<pathelement location="../org.eclipse.mylyn.docs.epub.ant/bin"/>
+		<pathelement location="../org.eclipse.mylyn.docs.epub.ant.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.docs.epub.ant.core/bin"/>
 	</path>
 			
-	<taskdef classpathref="epub.ant.classpath" 		
+	<taskdef classpathref="wikitext.ant.classpath" 		
 		resource="org/eclipse/mylyn/docs/epub/ant/tasks.properties" />
 
 	<target name="build">	
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant b/docs/org.eclipse.mylyn.docs.epub.help/build-docs.ant
similarity index 77%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant
rename to docs/org.eclipse.mylyn.docs.epub.help/build-docs.ant
index 5e100b6..ee44e5f 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/build-docs.ant
+++ b/docs/org.eclipse.mylyn.docs.epub.help/build-docs.ant
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
-    Copyright (c) 2007, 2009, 2017 David Green and others.
+    Copyright (c) 2007, 2009 David Green and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
     which accompanies this distribution, and is available at
@@ -23,15 +23,14 @@
 		</delete>
 	</target>
 
-	<!-- Note that the WikiText component must be built first -->
 	<target name="build" description="generate plugin help documentation">
 		<taskdef resource="org/eclipse/mylyn/wikitext/ant/tasks.properties">
-			<classpath id="wikitext-core-classpath">
-				<fileset dir="../../../wikitext/core/repository/target/repository/plugins/">
-					<include name="*.jar"/>
-				</fileset>
-			</classpath>
-		</taskdef>
+      <classpath id="wikitext-core-classpath">
+        <fileset dir="../../wikitext/core/org.eclipse.mylyn.wikitext.ant/target"><include name="*.jar"/></fileset>
+        <fileset dir="../../wikitext/core/org.eclipse.mylyn.wikitext/target"><include name="*.jar"/></fileset>
+        <fileset dir="../../wikitext/core/org.eclipse.mylyn.wikitext.textile/target"><include name="*.jar"/></fileset>
+      </classpath>
+    </taskdef>
 
 		<mkdir dir="${basedir}/help"/>
 
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties b/docs/org.eclipse.mylyn.docs.epub.help/build.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/build.properties
rename to docs/org.eclipse.mylyn.docs.epub.help/build.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/Illustrations.002.jpg b/docs/org.eclipse.mylyn.docs.epub.help/docs/Illustrations.002.jpg
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/Illustrations.002.jpg
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/Illustrations.002.jpg
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/book/cover.jpg b/docs/org.eclipse.mylyn.docs.epub.help/docs/book/cover.jpg
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/book/cover.jpg
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/book/cover.jpg
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/book/title-page.html b/docs/org.eclipse.mylyn.docs.epub.help/docs/book/title-page.html
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/book/title-page.html
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/book/title-page.html
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/epub-ant-task.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/epub-ant-task.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/epub-ant-task.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/epub-ant-task.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/epub-format.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/epub-format.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/epub-format.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/epub-format.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/examples.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/examples.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/examples.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/examples.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/generate-ant.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.png b/docs/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.png
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.png
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.png
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/generate-epub.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/introduction.textile b/docs/org.eclipse.mylyn.docs.epub.help/docs/introduction.textile
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/introduction.textile
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/introduction.textile
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/nook-cover.png b/docs/org.eclipse.mylyn.docs.epub.help/docs/nook-cover.png
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/nook-cover.png
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/nook-cover.png
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key b/docs/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css b/docs/org.eclipse.mylyn.docs.epub.help/docs/style.css
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/docs/style.css
rename to docs/org.eclipse.mylyn.docs.epub.help/docs/style.css
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.xml b/docs/org.eclipse.mylyn.docs.epub.help/plugin.xml
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/plugin.xml
rename to docs/org.eclipse.mylyn.docs.epub.help/plugin.xml
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/pom.xml b/docs/org.eclipse.mylyn.docs.epub.help/pom.xml
similarity index 80%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/pom.xml
rename to docs/org.eclipse.mylyn.docs.epub.help/pom.xml
index b8748dc..c37c4e9 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.help/pom.xml
+++ b/docs/org.eclipse.mylyn.docs.epub.help/pom.xml
@@ -4,15 +4,13 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>epub.ui</artifactId>
+		<artifactId>org.eclipse.mylyn.docs-parent</artifactId>
 		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.11.0-SNAPSHOT</version>
 	</parent>
-	
-	<artifactId>org.eclipse.mylyn.docs.epub.help</artifactId>
 	<groupId>org.eclipse.mylyn.docs.epub</groupId>
-	<version>4.0.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.mylyn.docs.epub.help</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
@@ -30,10 +28,11 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<target>
-								<pathconvert refid="maven.compile.classpath"
-									property="compile_classpath" />
-								<ant antfile="build-docs.ant" inheritAll="true" />
-								<!-- <ant antfile="build-book.ant" inheritAll="true"/> -->
+								<pathconvert refid="maven.compile.classpath" property="compile_classpath"/>
+								<ant antfile="build-docs.ant" inheritAll="true"/>
+								<!--
+								<ant antfile="build-book.ant" inheritAll="true"/>
+								 -->
 							</target>
 						</configuration>
 						<goals>
@@ -45,7 +44,7 @@
 					<dependency>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
-						<version>21.0</version>
+						<version>15.0</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -66,5 +65,6 @@
 				<artifactId>maven-pmd-plugin</artifactId>
 			</plugin>
 		</plugins>
+
 	</build>
 </project>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/src/readme.txt b/docs/org.eclipse.mylyn.docs.epub.help/src/readme.txt
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/src/readme.txt
rename to docs/org.eclipse.mylyn.docs.epub.help/src/readme.txt
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml b/docs/org.eclipse.mylyn.docs.epub.help/toc.xml
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.help/toc.xml
rename to docs/org.eclipse.mylyn.docs.epub.help/toc.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.classpath b/docs/org.eclipse.mylyn.docs.epub.tests/.classpath
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.classpath
rename to docs/org.eclipse.mylyn.docs.epub.tests/.classpath
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.gitignore b/docs/org.eclipse.mylyn.docs.epub.tests/.gitignore
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.tests/.gitignore
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.project b/docs/org.eclipse.mylyn.docs.epub.tests/.project
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.project
rename to docs/org.eclipse.mylyn.docs.epub.tests/.project
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.runtime.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.core.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.team.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.pde.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.pde.prefs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.wst.validation.prefs
rename to docs/org.eclipse.mylyn.docs.epub.tests/.settings/org.eclipse.wst.validation.prefs
diff --git a/docs/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF b/docs/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d06aec3
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.tests
+Bundle-Version: 3.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit,
+ org.apache.ant;bundle-version="1.8.0",
+ org.apache.ant.source;bundle-version="1.8.0",
+ org.eclipse.emf.ecore;bundle-version="2.5.0",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="3.0.0",
+ org.eclipse.mylyn.docs.epub.core
+Bundle-ClassPath: .,
+ epubcheck/epubcheck-3.0.1.jar,
+ epubcheck/lib/commons-compress-1.4.1.jar,
+ epubcheck/lib/guava-13.0.1.jar,
+ epubcheck/lib/jing-20120724.0.0.jar,
+ epubcheck/lib/sac-1.3.jar,
+ epubcheck/lib/Saxon-HE-9.4.0.6.jar
+Import-Package: org.eclipse.mylyn.docs.epub.core,
+ org.junit
+Export-Package: org.eclipse.mylyn.docs.epub.tests;x-internal:=true,
+ org.eclipse.mylyn.docs.epub.tests.ant;x-internal:=true,
+ org.eclipse.mylyn.docs.epub.tests.api;x-internal:=true,
+ org.eclipse.mylyn.docs.epub.tests.core;x-internal:=true
+Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.docs.epub.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/OSGI-INF/l10n/bundle.properties
rename to docs/org.eclipse.mylyn.docs.epub.tests/OSGI-INF/l10n/bundle.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/about.html b/docs/org.eclipse.mylyn.docs.epub.tests/about.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/about.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/about.html
diff --git a/docs/org.eclipse.mylyn.docs.epub.tests/ant-test.xml b/docs/org.eclipse.mylyn.docs.epub.tests/ant-test.xml
new file mode 100644
index 0000000..a79ad13
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/ant-test.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Test markup-to-epub" basedir=".">
+	<property name="testdir" location="${basedir}/test/ant" />
+	<property name="srcdir" location="${basedir}/testdata" />
+
+	<path id="java.class.path">
+		<pathelement path="${java.class.path}" />
+	</path>
+
+	<path id="epub-classpath">
+		<pathelement location="${basedir}/../org.eclipse.mylyn.docs.epub.core/bin/" />
+		<pathelement location="${basedir}/../org.eclipse.mylyn.docs.epub.ant.core/bin/" />
+	</path>
+
+	<taskdef classpathref="epub-classpath" resource="org/eclipse/mylyn/docs/epub/ant/tasks.properties" />
+
+	<!-- Prepare source files that we need for the tests -->
+	<target name="init">
+		<delete dir="${testdir}" failonerror="false">
+			<fileset dir="${testdir}">
+				<include name="**/*" />
+			</fileset>
+		</delete>
+		<mkdir dir="${testdir}" />
+	</target>
+
+	<target name="test.publication">	
+		<epub identifierId="uuid" file="${testdir}/simple.epub" workingFolder="${testdir}/work">			
+			<title>Mylyn Docs Test EPUB</title>
+			<language code="en" />
+			<identifier id="uuid" scheme="UUID">urn:uuid:15bcb770-882d-11e0-9d78-0800200c9a66</identifier>
+			<subject>Testing</subject>
+			<creator fileAs="Resheim, Torkild U." role="aut" name="Torkild U. Resheim"/>
+			<publisher>Eclipse.org</publisher>
+			<item file="${srcdir}/plain-page.xhtml" />
+		</epub>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/build.properties b/docs/org.eclipse.mylyn.docs.epub.tests/build.properties
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/build.properties
rename to docs/org.eclipse.mylyn.docs.epub.tests/build.properties
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/epubcheck.xml b/docs/org.eclipse.mylyn.docs.epub.tests/epubcheck.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/epubcheck.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/epubcheck.xml
diff --git a/docs/org.eclipse.mylyn.docs.epub.tests/pom.xml b/docs/org.eclipse.mylyn.docs.epub.tests/pom.xml
new file mode 100644
index 0000000..d73b0fc
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.mylyn.docs-parent</artifactId>
+		<groupId>org.eclipse.mylyn.docs</groupId>
+		<version>2.11.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.mylyn.docs.epub.tests</artifactId>
+	<version>3.2.0-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+  <properties>
+    <test.suite>${project.artifactId}.AllTests</test.suite>
+  </properties>
+	<build>
+		<plugins>		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.6</version>
+				<executions>
+					<execution>
+					  <id>epubcheck</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+							<!-- Bug 454932 - fix or remove failing EPUB test
+                				<ant antfile="epubcheck.xml" inheritAll="true"/>
+                			-->
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+		        <configuration>
+		          <skip>${test.component.skip}</skip> 
+		          <testSuite>${project.artifactId}</testSuite>
+		          <testClass>${test.suite}</testClass>
+		          <useUIHarness>false</useUIHarness>
+		        </configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<groupId>org.eclipse.mylyn.docs.epub</groupId>
+</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/AllTests.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/AllTests.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/AllTests.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/AllTests.java
diff --git a/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/ant/TestAntTask.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/ant/TestAntTask.java
new file mode 100644
index 0000000..96571a1
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/ant/TestAntTask.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2013 Torkild U. Resheim.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Torkild U. Resheim - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.docs.epub.tests.ant;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildFileTest;
+
+/**
+ * Tests for the <b>epub</b> ANT task.
+ *
+ * @author Torkild U. Resheim
+ */
+@SuppressWarnings("nls")
+public class TestAntTask extends BuildFileTest {
+
+	static ClassLoader classLoader;
+
+	private static final String SIMPLE_FILE_PATH = "test/ant/simple.epub";
+
+	public TestAntTask(String s) {
+		super(s);
+		classLoader = getClass().getClassLoader();
+	}
+
+	private void assertEpub(String file) {
+		File f = getFile(file);
+		assertTrue("Missing publication " + file, f.exists());
+		/* Bug 454932 - fix or remove failing EPUB test
+		StringWriter sw = new StringWriter();
+		PrintWriter pw = new PrintWriter(sw);
+		EpubCheck checker = new EpubCheck(f, pw);
+		assertTrue(sw.getBuffer().toString().trim(), checker.validate());
+		 */
+	}
+
+	private File getFile(String file) {
+		return new File(getProjectDir().getAbsolutePath() + File.separator + file);
+	}
+
+	@Override
+	public void setUp() {
+		configureProject("ant-test.xml");
+		project.setCoreLoader(this.getClass().getClassLoader());
+	}
+
+	/**
+	 * Creates a simple book using the Ant task and tests it using the epub validator.
+	 */
+	public void testSimplePublication() {
+		executeTarget("init");
+		executeTarget("test.publication");
+		assertEpub(SIMPLE_FILE_PATH);
+	}
+
+}
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/AbstractTest.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUB.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestEPUBPublication.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestOPSPublication.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/api/TestPublication.java
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
similarity index 94%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
index 006d659..8df74f5 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEPUBFileUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 Torkild U. Resheim and others.
+ * Copyright (c) 2014 Torkild U. Resheim and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,12 +13,12 @@
 
 import java.io.File;
 
-import org.eclipse.mylyn.docs.epub.internal.EPUBFileUtil;
-import org.junit.Test;
-
 import junit.framework.TestCase;
 
-@SuppressWarnings({ "nls" })
+import org.eclipse.mylyn.internal.docs.epub.core.EPUBFileUtil;
+import org.junit.Test;
+
+@SuppressWarnings({ "nls", "restriction" })
 public class TestEPUBFileUtil extends TestCase {
 
 	/*
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
similarity index 92%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
index 6d7ee73..e5592cf 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestEclipseTocImporter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 Torkild U. Resheim and others.
+ * Copyright (c) 2014 Torkild U. Resheim and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,8 +18,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.mylyn.docs.epub.core.OPSPublication;
-import org.eclipse.mylyn.docs.epub.internal.EclipseTocImporter;
 import org.eclipse.mylyn.docs.epub.tests.api.AbstractTest;
+import org.eclipse.mylyn.internal.docs.epub.core.EclipseTocImporter;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.DOMException;
@@ -28,6 +28,7 @@
 /**
  * The purpose of this type is to test that the Eclipse Table of Contents importer works as it should.
  */
+@SuppressWarnings("restriction")
 public class TestEclipseTocImporter extends AbstractTest {
 
 	private OPSPublication oebps;
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
similarity index 84%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
index a9706a0..cccd12f 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestOPSValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2014, 2017 Torkild U. Resheim.
+ * Copyright (c) 2011-2014 Torkild U. Resheim.
  *
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License v1.0 which
@@ -16,20 +16,20 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.eclipse.mylyn.docs.epub.internal.OPSValidator;
+import junit.framework.TestCase;
+
+import org.eclipse.mylyn.internal.docs.epub.core.OPSValidator;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import junit.framework.TestCase;
-
 /**
  * Tests for the OPS validator.
  *
  * @author Torkild U. Resheim
  * @see http://idpf.org/epub/20/spec/OPS_2.0.1_draft.htm
  */
-@SuppressWarnings({ "nls" })
+@SuppressWarnings({ "restriction", "nls" })
 public class TestOPSValidator extends TestCase {
 
 	private final String[] illegalAttributes = new String[] { "anything", "goes", "in", "here" };
@@ -45,11 +45,12 @@
 	 * @see http://idpf.org/epub/20/spec/OPS_2.0.1_draft.htm#Section1.3.4
 	 * @see http://idpf.org/epub/20/spec/OPS_2.0.1_draft.htm#Section2.2
 	 */
-	private final String[] legalElements = new String[] { "body", "head", "html", "title", "abbr", "acronym", "address",
-			"blockquote", "br", "cite", "code", "dfn", "div", "em", "h1", "h2", "h3", "h4", "h5", "h6", "kbd", "p",
-			"pre", "q", "samp", "span", "strong", "var", "a", "dl", "dt", "dd", "ol", "ul", "li", "object", "param",
-			"b", "big", "hr", "i", "small", "sub", "sup", "tt", "del", "ins", "bdo", "caption", "col", "colgroup",
-			"table", "tbody", "td", "tfoot", "th", "thead", "tr", "img", "area", "map", "style", "link", "base" };
+	private final String[] legalElements = new String[] { "body", "head", "html", "title", "abbr", "acronym",
+			"address", "blockquote", "br", "cite", "code", "dfn", "div", "em", "h1", "h2", "h3", "h4", "h5", "h6",
+			"kbd", "p", "pre", "q", "samp", "span", "strong", "var", "a", "dl", "dt", "dd", "ol", "ul", "li", "object",
+			"param", "b", "big", "hr", "i", "small", "sub", "sup", "tt", "del", "ins", "bdo", "caption", "col",
+			"colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "img", "area", "map", "style", "link",
+			"base" };
 
 	@Test
 	public void testIllegalAttributes() throws ParserConfigurationException, SAXException, IOException {
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
similarity index 94%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
rename to docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
index 0a8d65e..22c92e4 100644
--- a/epub/core/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
+++ b/docs/org.eclipse.mylyn.docs.epub.tests/src/org/eclipse/mylyn/docs/epub/tests/core/TestTOCGenerator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013, 2017 Torkild U. Resheim.
- *
+ * Copyright (c) 2011, 2013 Torkild U. Resheim.
+ * 
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License v1.0 which
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  *   Torkild U. Resheim - initial API and implementation
  *******************************************************************************/
 package org.eclipse.mylyn.docs.epub.tests.core;
@@ -16,24 +16,24 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import junit.framework.TestCase;
+
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.docs.epub.internal.TOCGenerator;
 import org.eclipse.mylyn.docs.epub.ncx.NCXFactory;
 import org.eclipse.mylyn.docs.epub.ncx.NavMap;
 import org.eclipse.mylyn.docs.epub.ncx.NavPoint;
 import org.eclipse.mylyn.docs.epub.ncx.Ncx;
+import org.eclipse.mylyn.internal.docs.epub.core.TOCGenerator;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import junit.framework.TestCase;
-
 /**
  * Tests for the table of contents generator.
- *
+ * 
  * @author Torkild U. Resheim
  */
-@SuppressWarnings({ "nls" })
+@SuppressWarnings({ "restriction", "nls" })
 public class TestTOCGenerator extends TestCase {
 
 	@Test
@@ -62,7 +62,7 @@
 
 	/**
 	 * All items should be placed at the root.
-	 *
+	 * 
 	 * @throws ParserConfigurationException
 	 * @throws SAXException
 	 * @throws IOException
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/Dogfood/toc.ncx b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/Dogfood/toc.ncx
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/Dogfood/toc.ncx
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/Dogfood/toc.ncx
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/SocketException/toc.ncx b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/SocketException/toc.ncx
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/SocketException/toc.ncx
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/NCX-Tests/SocketException/toc.ncx
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Bug_378800/META-INF/container.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Bug_378800/META-INF/container.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Bug_378800/META-INF/container.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Bug_378800/META-INF/container.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Dogfood/META-INF/container.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Dogfood/META-INF/container.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Dogfood/META-INF/container.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/Dogfood/META-INF/container.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/SocketException/META-INF/container.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/SocketException/META-INF/container.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/SocketException/META-INF/container.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OCF-Tests/SocketException/META-INF/container.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_358671/illegal-type.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_358671/illegal-type.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_358671/illegal-type.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_358671/illegal-type.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-1.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-1.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-1.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-1.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-2.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-2.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-2.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/chapter-2.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/style.css b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/style.css
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/style.css
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_379052/style.css
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/chapter.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/chapter.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/chapter.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/chapter.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/style.css b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/style.css
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/style.css
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380016/style.css
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380729/content.opf b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380729/content.opf
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380729/content.opf
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Bug_380729/content.opf
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Dogfood/content.opf b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Dogfood/content.opf
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Dogfood/content.opf
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/Dogfood/content.opf
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/basic.opf b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/basic.opf
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/basic.opf
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/basic.opf
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/content.opf b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/content.opf
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/content.opf
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/EPUB3/content.opf
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/SocketException/content.opf b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/SocketException/content.opf
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/SocketException/content.opf
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/OPF-Tests/SocketException/content.opf
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/book.css b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/book.css
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/book.css
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/book.css
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-a.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-a.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-a.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-a.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-b.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-b.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-b.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-b.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-c.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-c.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-c.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/circular/file-c.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/README.txt b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/README.txt
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/README.txt
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/README.txt
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/basic_2.epub b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/basic_2.epub
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/basic_2.epub
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/basic_2.epub
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xxx b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xxx
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xxx
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/content.xxx
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/drawing.svg b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/drawing.svg
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/drawing.svg
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/drawing.svg
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.gif b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.gif
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.gif
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.gif
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.png b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.png
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.png
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/image.png
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.jpeg b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.jpeg
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.jpeg
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.jpeg
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.xxx b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.xxx
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.xxx
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/picture.xxx
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/style.css b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/style.css
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/style.css
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/style.css
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/xml.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/xml.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/xml.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/content-detection/xml.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/drawing.svg b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/drawing.svg
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/drawing.svg
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/drawing.svg
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/README.txt b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/README.txt
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/README.txt
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/README.txt
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_2.epub b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_2.epub
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_2.epub
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_2.epub
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_3.epub b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_3.epub
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_3.epub
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/epub/basic_3.epub
Binary files differ
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/images/subfolder-drawing.svg b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/images/subfolder-drawing.svg
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/images/subfolder-drawing.svg
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/images/subfolder-drawing.svg
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/b.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/b.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/b.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/b.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/c.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/c.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/c.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/c.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/a.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/a.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/a.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/a.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/b.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/b.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/b.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/b.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/c.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/c.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/c.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/help/c.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/readme.txt b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/readme.txt
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/readme.txt
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/readme.txt
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/root.xml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/root.xml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/root.xml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/import/eclipse-toc/root.xml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_link.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.html b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.html
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.html
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.html
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_no-header.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_warnings.xhtml b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_warnings.xhtml
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_warnings.xhtml
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/plain-page_warnings.xhtml
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/style.css b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/style.css
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/style.css
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/style.css
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/toc.ncx b/docs/org.eclipse.mylyn.docs.epub.tests/testdata/toc.ncx
similarity index 100%
rename from epub/core/org.eclipse.mylyn.docs.epub.tests/testdata/toc.ncx
rename to docs/org.eclipse.mylyn.docs.epub.tests/testdata/toc.ncx
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.classpath b/docs/org.eclipse.mylyn.docs.epub.ui/.classpath
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.classpath
rename to docs/org.eclipse.mylyn.docs.epub.ui/.classpath
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.gitignore b/docs/org.eclipse.mylyn.docs.epub.ui/.gitignore
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.gitignore
rename to docs/org.eclipse.mylyn.docs.epub.ui/.gitignore
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.project b/docs/org.eclipse.mylyn.docs.epub.ui/.project
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.project
rename to docs/org.eclipse.mylyn.docs.epub.ui/.project
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.resources.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.runtime.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.runtime.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.core.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.team.ui.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.team.ui.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.pde.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.pde.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.wst.validation.prefs
rename to docs/org.eclipse.mylyn.docs.epub.ui/.settings/org.eclipse.wst.validation.prefs
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF b/docs/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
similarity index 80%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
rename to docs/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
index cea5d61..c63d72b 100644
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.docs.epub.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.mylyn.docs.epub.core;bundle-version="4.0.0",
- org.eclipse.mylyn.wikitext.ui;bundle-version="3.0.10",
- org.eclipse.mylyn.wikitext;bundle-version="3.0.10",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="1.0.0",
+ org.eclipse.mylyn.wikitext.ui;bundle-version="1.11.0",
+ org.eclipse.mylyn.wikitext;bundle-version="1.11.0",
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.databinding,
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/OSGI-INF/l10n/bundle.properties b/docs/org.eclipse.mylyn.docs.epub.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/OSGI-INF/l10n/bundle.properties
rename to docs/org.eclipse.mylyn.docs.epub.ui/OSGI-INF/l10n/bundle.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html b/docs/org.eclipse.mylyn.docs.epub.ui/about.html
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/about.html
rename to docs/org.eclipse.mylyn.docs.epub.ui/about.html
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties b/docs/org.eclipse.mylyn.docs.epub.ui/build.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/build.properties
rename to docs/org.eclipse.mylyn.docs.epub.ui/build.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/icons/wizard-banner.png b/docs/org.eclipse.mylyn.docs.epub.ui/icons/wizard-banner.png
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/icons/wizard-banner.png
rename to docs/org.eclipse.mylyn.docs.epub.ui/icons/wizard-banner.png
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.xml b/docs/org.eclipse.mylyn.docs.epub.ui/plugin.xml
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/plugin.xml
rename to docs/org.eclipse.mylyn.docs.epub.ui/plugin.xml
diff --git a/docs/org.eclipse.mylyn.docs.epub.ui/pom.xml b/docs/org.eclipse.mylyn.docs.epub.ui/pom.xml
new file mode 100644
index 0000000..7ca5ac2
--- /dev/null
+++ b/docs/org.eclipse.mylyn.docs.epub.ui/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.mylyn.docs-parent</artifactId>
+    <groupId>org.eclipse.mylyn.docs</groupId>
+    <version>2.11.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.mylyn.docs.epub.ui</artifactId>
+  <version>2.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <groupId>org.eclipse.mylyn.docs.epub</groupId>
+</project>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src-images/wizard-banner.psd b/docs/org.eclipse.mylyn.docs.epub.ui/src-images/wizard-banner.psd
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src-images/wizard-banner.psd
rename to docs/org.eclipse.mylyn.docs.epub.ui/src-images/wizard-banner.psd
Binary files differ
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/ConvertFromMarkupWizard.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/EPUBUIPlugin.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/MainPage.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/Messages.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/ConvertMarkupToEPUB.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/Messages.java
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/commands/messages.properties
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties b/docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
similarity index 100%
rename from epub/ui/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
rename to docs/org.eclipse.mylyn.docs.epub.ui/src/org/eclipse/mylyn/internal/docs/epub/ui/messages.properties
diff --git a/docs/pom.xml b/docs/pom.xml
index d297b28..00baa24 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -135,7 +135,13 @@
         <module>org.eclipse.mylyn.htmltext-feature</module>
         <module>org.eclipse.mylyn.htmltext.ui</module>
 
+        <module>org.eclipse.mylyn.docs.epub.core</module>
+        <module>org.eclipse.mylyn.docs.epub.ant.core</module>
+        <module>org.eclipse.mylyn.docs.epub.ui</module>
+        <module>org.eclipse.mylyn.docs.epub.help</module>
         <module>org.eclipse.mylyn.docs.epub.sdk-feature</module>
+        <module>org.eclipse.mylyn.docs.epub.tests</module>
+        <module>org.eclipse.mylyn.docs.epub-feature</module>
 
         <module>org.eclipse.mylyn.docs-site</module>
     </modules>
diff --git a/epub/.project b/epub/.project
deleted file mode 100644
index cff6771..0000000
--- a/epub/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>epub</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/epub/core/.gitignore b/epub/core/.gitignore
deleted file mode 100644
index 25c8e31..0000000
--- a/epub/core/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*/META-INF
-pom.xml.releaseBackup
-release.properties
diff --git a/epub/core/.project b/epub/core/.project
deleted file mode 100644
index 0c305bd..0000000
--- a/epub/core/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>epub.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.project b/epub/core/org.eclipse.mylyn.docs.epub.ant/.project
deleted file mode 100644
index e4f1a13..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.project
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.docs.epub.ant</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1367109048408</id>
-			<name></name>
-			<type>10</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-false-target</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.core.runtime.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.jdt.ui.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 2e69819..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Wed Mar 02 16:00:06 PST 2011
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=12
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) 2012 Torkild U. Resheim and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Torkild U. Resheim - initial API and implementation\n *******************************************************************************/\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 3e988b0..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Jul 31 11:01:26 PDT 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.team.ui.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 31c5985..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-commit.comment.template=${task.key}\: ${task.summary}\n\nBug\: ${task.key}\nTask-Url\: ${task.url}
-eclipse.preferences.version=1
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.pde.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.wst.validation.prefs b/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 93fb520..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Thu Jul 31 11:01:26 PDT 2008
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
-override=false
-suspend=false
-vf.version=3
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.ant/pom.xml b/epub/core/org.eclipse.mylyn.docs.epub.ant/pom.xml
deleted file mode 100644
index 9579e36..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.ant/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>epub.core</artifactId>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.eclipse.mylyn.docs.epub.ant</artifactId>
-	<groupId>org.eclipse.mylyn.docs</groupId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>bundle</packaging>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.9.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.mylyn.docs</groupId>
-			<artifactId>org.eclipse.mylyn.docs.epub.core</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/README.txt b/epub/core/org.eclipse.mylyn.docs.epub.core/README.txt
deleted file mode 100644
index bbfb4a4..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Note that externalisation of strings in types contained within this bundle is
-done using standard Java instead of NLS which is common elsewhere in Mylyn.
-This is done to avoid having dependencies on OSGi since the Ant task for
-handling EPUBs also use these types.
-
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.5.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
- org.eclipse.emf.common;bundle-version="2.5.0",
- org.eclipse.mylyn.wikitext.core;bundle-version="1.11.0",
- org.apache.tika.core;bundle-version="1.3.0",
- org.apache.tika.parsers;bundle-version="1.3.0"
\ No newline at end of file
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.core/pom.xml b/epub/core/org.eclipse.mylyn.docs.epub.core/pom.xml
deleted file mode 100644
index f15dc0b..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.core/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>epub.core</artifactId>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.eclipse.mylyn.docs.epub.core</artifactId>
-	<groupId>org.eclipse.mylyn.docs</groupId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>bundle</packaging>
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src-gen</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.2.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <manifestLocation>META-INF</manifestLocation>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
-                        <Export-Package>${project.artifactId}.internal*;x-internal:=true,${project.artifactId}*, org.eclipse.mylyn.docs.epub.*</Export-Package>
-                        <Import-Package>org.apache.tika.*;version="0", org.eclipse.emf.*, org.eclipse.mylyn.wikitext.*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.emf</groupId>
-			<artifactId>org.eclipse.emf.ecore</artifactId>
-			<version>2.12.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.emf</groupId>
-			<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-			<version>2.12.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.emf</groupId>
-			<artifactId>org.eclipse.emf.common</artifactId>
-			<version>2.12.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.mylyn.docs</groupId>
-			<artifactId>org.eclipse.mylyn.wikitext</artifactId>
-			<version>3.0.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-core</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-parsers</artifactId>
-			<version>1.3</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/epub/core/org.eclipse.mylyn.docs.epub.tests/pom.xml b/epub/core/org.eclipse.mylyn.docs.epub.tests/pom.xml
deleted file mode 100644
index 39cbd98..0000000
--- a/epub/core/org.eclipse.mylyn.docs.epub.tests/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>epub.core</artifactId>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.eclipse.mylyn.docs.epub.tests</artifactId>
-	<groupId>org.eclipse.mylyn.docs</groupId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>bundle</packaging>
-	
-	<properties>
-		<test.suite>${project.artifactId}.AllTests</test.suite>
-	</properties>
-	
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<id>epubcheck</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<!-- Bug 454932 - fix or remove failing EPUB test <ant antfile="epubcheck.xml" 
-									inheritAll="true"/> -->
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.9.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.mylyn.docs</groupId>
-			<artifactId>org.eclipse.mylyn.docs.epub.core</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.mylyn.docs</groupId>
-			<artifactId>org.eclipse.mylyn.docs.epub.ant</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/epub/core/pom.xml b/epub/core/pom.xml
deleted file mode 100644
index d938f03..0000000
--- a/epub/core/pom.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.eclipse.mylyn.docs</groupId>
-    <artifactId>epub.core</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <name>Mylyn Docs: EPUB Core</name>
-    <description>The EPUB framework in Mylyn Docs offers API to create, manipulate, read and write EPUB formatted files. There is also an Ant task for creating EPUBs.</description>
-    <url>https://projects.eclipse.org/projects/mylyn.docs</url>
-    <packaging>pom</packaging>
-
-    <profiles>
-        <profile>
-            <id>ossrh</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>sign</id>
-            <properties>
-                <artifacts.sign>true</artifacts.sign>
-            </properties>
-        </profile>
-    </profiles>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <scm.developerConnection>scm:git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.git</scm.developerConnection>
-    </properties>
-
-    <modules>
-        <module>org.eclipse.mylyn.docs.epub.core</module>
-        <module>org.eclipse.mylyn.docs.epub.ant</module>
-        <module>org.eclipse.mylyn.docs.epub.tests</module>
-        <module>repository</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.2.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <manifestLocation>META-INF</manifestLocation>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
-                        <Export-Package>${project.artifactId}.internal*;x-internal:=true,${project.artifactId}*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <uniqueVersion>false</uniqueVersion>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src</directory>
-            </resource>
-            <resource>
-                <directory>src-gen</directory>
-            </resource>
-            <resource>
-                <directory>.</directory>
-                <includes>
-                    <include>model/*</include>
-                    <include>about.*</include>
-                    <include>feature.gif</include>
-                    <include>plugin.*</include>
-                </includes>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <licenses>
-        <license>
-            <name>Eclipse Public License Version 1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <organization>
-        <name>Eclipse Mylyn</name>
-        <url>http://eclipse.org/mylyn</url>
-    </organization>
-    <issueManagement>
-        <system>Bugzilla</system>
-        <url>https://bugs.eclipse.org/</url>
-    </issueManagement>
-    <scm>
-        <developerConnection>${scm.developerConnection}</developerConnection>
-        <connection>scm:git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.git</connection>
-        <url>https://git.eclipse.org/c/mylyn/org.eclipse.mylyn.docs.git</url>
-        <tag>HEAD</tag>
-    </scm>
-    <developers>
-        <developer>
-            <url>https://projects.eclipse.org/projects/mylyn.docs/who</url>
-        </developer>
-    </developers>
-
-</project>
diff --git a/epub/core/repository/pom.xml b/epub/core/repository/pom.xml
deleted file mode 100644
index 1ecc2b9..0000000
--- a/epub/core/repository/pom.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.mylyn.docs</groupId>
-        <artifactId>epub.core</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-
-    </parent>
-
-    <artifactId>epub.core.repository</artifactId>
-    <name>Mylyn EPUB Core p2 Repository</name>
-    <packaging>pom</packaging>
-
-    <properties>
-        <!-- artifacts.sign>true</artifacts.sign -->
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <!-- prepare pom for generating p2 site -->
-                        <id>create-unsigned-p2-site</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <target>
-                                <property name="epub.version" value="${project.version}" />
-                                <echo level="info">creating repository with version ${epub.version}</echo>
-                                <copy file="repository-pom-template.xml" tofile="repository-pom.xml" overwrite="true">
-                                    <filterset>
-                                        <filter token="EPUB_VERSION" value="${epub.version}" />
-                                    </filterset>
-                                </copy>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <!-- remove p2 metadata to avoid broken checksums when signing -->
-                        <id>prepare-p2-site</id>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <target>
-                                <delete file="${project.build.directory}/repository/artifacts.jar" />
-                                <copy file="site.xml" tofile="${project.build.directory}/repository/site.xml" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <!-- sign p2 repository artifacts -->
-                        <id>sign-p2-site-artifacts</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <target if="artifacts.sign">
-                                <echo level="info">Signing p2 artifacts:</echo>
-                                <apply executable="curl" parallel="false" dir="${project.build.directory}/repository/plugins" relative="true">
-                                    <arg value="--output" />
-                                    <targetfile />
-                                    <arg value="--form" />
-                                    <srcfile prefix="file=@" />
-                                    <arg value="--silent" />
-                                    <arg value="--show-error" />
-                                    <arg value="--fail" />
-                                    <arg value="http://build.eclipse.org:31338/sign" />
-
-                                    <fileset dir="${project.build.directory}/repository/plugins">
-                                        <include name="*.jar" />
-                                    </fileset>
-                                    <mapper type="glob" from="*.jar" to="*.jar" />
-                                </apply>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-invoker-plugin</artifactId>
-                <version>2.0.0</version>
-                <configuration>
-                    <pom>repository-pom.xml</pom>
-                    <streamLogs>true</streamLogs>
-                    <localRepositoryPath>.local-repo</localRepositoryPath>
-                    <disableReports>true</disableReports>
-                    <reportsDirectory>${project.build.directory}</reportsDirectory>
-                    <goals>
-                        <goal>clean</goal>
-                        <goal>package</goal>
-                    </goals>
-                </configuration>
-                <executions>
-                    <execution>
-                        <!-- create the p2 repository -->
-                        <id>two-part-repository-build</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>install</goal>
-                            <!-- install to avoid stale p2 cache with locally built artifacts -->
-                            <goal>run</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-p2-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <!-- regenerate p2 repository metadata after signing -->
-                        <id>generate-p2-metadata</id>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <target>${project.build.directory}/repository</target>
-                        </configuration>
-                        <goals>
-                            <goal>update-site-p2-metadata</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>reficio</id>
-            <url>http://repo.reficio.org/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
-</project>
diff --git a/epub/core/repository/repository-pom-template.xml b/epub/core/repository/repository-pom-template.xml
deleted file mode 100644
index f71fefa..0000000
--- a/epub/core/repository/repository-pom-template.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.mylyn.docs</groupId>
-        <artifactId>epub.core</artifactId>
-        <version>@EPUB_VERSION@</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <artifactId>epub.core.repository</artifactId>
-    <name>Mylyn Docs EPUB Core p2 Repository</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.reficio</groupId>
-                <artifactId>p2-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-p2-site</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>site</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <id>org.eclipse.mylyn.docs:org.eclipse.mylyn.docs.epub.core:@EPUB_VERSION@</id>
-                                    <transitive>false</transitive>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>org.eclipse.mylyn.docs:org.eclipse.mylyn.docs.epub.ant:@EPUB_VERSION@</id>
-                                    <transitive>false</transitive>
-                                    <source>true</source>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>reficio</id>
-            <url>http://repo.reficio.org/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
-</project>
diff --git a/epub/core/repository/repository-pom.xml b/epub/core/repository/repository-pom.xml
deleted file mode 100644
index fe42aee..0000000
--- a/epub/core/repository/repository-pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.mylyn.docs</groupId>
-        <artifactId>epub.core</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <artifactId>epub.core.repository</artifactId>
-    <name>Mylyn Docs EPUB Core p2 Repository</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.reficio</groupId>
-                <artifactId>p2-maven-plugin</artifactId>
-                <version>1.2.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-p2-site</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>site</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <id>org.eclipse.mylyn.docs:org.eclipse.mylyn.docs.epub.core:4.0.0-SNAPSHOT</id>
-                                    <transitive>false</transitive>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>org.eclipse.mylyn.docs:org.eclipse.mylyn.docs.epub.ant:4.0.0-SNAPSHOT</id>
-                                    <transitive>false</transitive>
-                                    <source>true</source>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>reficio</id>
-            <url>http://repo.reficio.org/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
-</project>
diff --git a/epub/core/repository/site.xml b/epub/core/repository/site.xml
deleted file mode 100644
index 59fdfb8..0000000
--- a/epub/core/repository/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <description>
-    Mylyn EPUB Core
-  </description>
-</site>
diff --git a/epub/pom.xml b/epub/pom.xml
deleted file mode 100644
index 8b8f14d..0000000
--- a/epub/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.mylyn.docs</groupId>
-    <artifactId>epub</artifactId>
-    <name>Mylyn Docs: EPUB</name>
-    <version>4.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho-version>1.0.0</tycho-version>
-    </properties>
-
-    <modules>
-        <module>core</module>
-        <module>ui-pom.xml</module>
-    </modules>
-
-    <profiles>
-        <profile>
-            <id>sign</id>
-            <properties>
-                <artifacts.sign>true</artifacts.sign>
-            </properties>
-        </profile>
-    </profiles>
-    
-    <licenses>
-        <license>
-            <name>Eclipse Public License Version 1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <organization>
-        <name>Eclipse Mylyn</name>
-        <url>http://eclipse.org/mylyn</url>
-    </organization>
-</project>
diff --git a/epub/ui-pom.xml b/epub/ui-pom.xml
deleted file mode 100644
index c9defaa..0000000
--- a/epub/ui-pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<artifactId>epub</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>./pom.xml</relativePath>
-	</parent>
-
-	<artifactId>epub.ui.build</artifactId>
-	<name>Mylyn Docs: EPUB UI Build</name>
-	<packaging>pom</packaging>
-
-	<properties>
-		<epub.goal>verify</epub.goal>
-		<p2.repo.local>${basedir}/../.local-repo</p2.repo.local>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.4</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>3.8</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.7.0</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>update-targets</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<target>
-								<property name="target-file" value="${basedir}/ui/targets/epub.target" />
-								<property name="target-file-template" value="${target-file}-template" />
-								<delete file="${target-file}" failonerror="false" />
-								<copy file="${target-file-template}" tofile="${target-file}" />
-								<replaceregexp file="${target-file}" byline="true">
-									<regexp pattern="EPUB_ROOT" />
-									<substitution expression="${basedir}" />
-								</replaceregexp>
-								<replaceregexp file="${target-file}" byline="true">
-									<regexp pattern="WIKITEXT_ROOT" />
-									<substitution expression="${basedir}/../wikitext" />
-								</replaceregexp>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>remove-epub-from-p2-index</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<target>
-								<property name="p2-index-file"
-									value="${p2.repo.local}/.meta/p2-artifacts.properties" />
-								<touch file="${p2-index-file}" mkdirs="true" />
-								<replaceregexp file="${p2-index-file}" flags="gm">
-									<regexp
-										pattern="^p2\.osgi\.bundle\:org\.eclipse\.mylyn\.docs.\epub\..*$" />
-									<substitution expression="" />
-								</replaceregexp>
-								<delete includeemptydirs="true">
-									<fileset dir="${p2.repo.local}" defaultexcludes="false">
-										<include name="org/eclipse/mylyn/docs/**" />
-									</fileset>
-									<fileset dir="${p2.repo.local}" defaultexcludes="false">
-										<include
-											name="p2/org/eclipse/update/feature/org.eclipse.mylyn.docs.epub*/**" />
-									</fileset>
-									<fileset dir="${p2.repo.local}" defaultexcludes="false">
-										<include name="p2/osgi/bundle/org.eclipse.mylyn.docs.epub*/**" />
-									</fileset>
-								</delete>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<!-- Maven invoker plugin is used as a way to delay Tycho target platform 
-					resolution, since part of the target platform is created as part of the build. -->
-				<artifactId>maven-invoker-plugin</artifactId>
-				<version>2.0.0</version>
-				<configuration>
-					<pom>ui/pom.xml</pom>
-					<streamLogs>true</streamLogs>
-					<localRepositoryPath>.local-repo</localRepositoryPath>
-					<properties>
-						<artifacts.sign>${artifacts.sign}</artifacts.sign>
-					</properties>
-					<goals>
-						<goal>clean</goal>
-						<goal>${epub.goal}</goal>
-					</goals>
-				</configuration>
-				<executions>
-					<execution>
-						<id>two-part-build</id>
-						<goals>
-							<goal>install</goal>
-							<!-- install to avoid stale p2 cache with locally built artifacts -->
-							<goal>run</goal>
-							<goal>verify</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/epub/ui/.project b/epub/ui/.project
deleted file mode 100644
index 1eb83f9..0000000
--- a/epub/ui/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>epub.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub-feature/pom.xml b/epub/ui/org.eclipse.mylyn.docs.epub-feature/pom.xml
deleted file mode 100644
index 0b09597..0000000
--- a/epub/ui/org.eclipse.mylyn.docs.epub-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<artifactId>epub.ui</artifactId>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>org.eclipse.mylyn.docs.epub</artifactId>
-	<groupId>org.eclipse.mylyn.docs</groupId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/epub/ui/org.eclipse.mylyn.docs.epub.ui/pom.xml b/epub/ui/org.eclipse.mylyn.docs.epub.ui/pom.xml
deleted file mode 100644
index b079707..0000000
--- a/epub/ui/org.eclipse.mylyn.docs.epub.ui/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>epub.ui</artifactId>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.mylyn.docs.epub.ui</artifactId>
-	<groupId>org.eclipse.mylyn.docs</groupId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-	<!-- it is not quite clear why this is needed or the bundle will not be found -->
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.mylyn.docs</groupId>
-			<artifactId>org.eclipse.mylyn.docs.epub.core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/epub/ui/pom.xml b/epub/ui/pom.xml
deleted file mode 100644
index fe51361..0000000
--- a/epub/ui/pom.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<artifactId>epub</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<artifactId>epub.ui</artifactId>
-	<name>Mylyn Docs:EPUB UI</name>
-	<packaging>pom</packaging>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>1.0.0</tycho-version>
-		<tycho-extras-version>${tycho-version}</tycho-extras-version>
-
-		<test.skip>${maven.test.skip}</test.skip>
-		<test.ui.skip>${test.skip}</test.ui.skip>
-		<test.vmargs>-ea ${test.osvmargs} ${test.uservmargs}</test.vmargs>
-		<test.uservmargs></test.uservmargs>
-		<test.osvmargs></test.osvmargs>
-
-		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs.git</tycho.scmUrl>
-		<tycho.testArgLine></tycho.testArgLine>
-	</properties>
-
-	<profiles>
-		<profile>
-			<id>osx</id>
-			<activation>
-				<property>
-					<name>os.name</name>
-					<value>Mac OS X</value>
-				</property>
-			</activation>
-			<properties>
-				<test.osvmargs>-Dosgi.ws=cocoa -XstartOnFirstThread</test.osvmargs>
-			</properties>
-		</profile>
-		<profile>
-			<id>sign</id>
-			<activation>
-				<property>
-					<name>artifacts.sign</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.1.3</version>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>eclipse-cbi</id>
-					<name>Eclipse CBI</name>
-					<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-	</profiles>
-
-	<modules>
-		<module>targets</module>
-		<module>org.eclipse.mylyn.docs.epub.help</module>
-		<module>org.eclipse.mylyn.docs.epub.ui</module>
-		<module>org.eclipse.mylyn.docs.epub-feature</module>
-	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<target>
-						<artifact>
-							<groupId>org.eclipse.mylyn.docs</groupId>
-							<artifactId>epub.ui.target</artifactId>
-							<classifier>epub</classifier>
-							<version>4.0.0-SNAPSHOT</version>
-						</artifact>
-					</target>
-					<resolver>p2</resolver>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-					<pomDependencies>consider</pomDependencies>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>3.0.4</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<version>3.8</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-source-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<executions>
-						<execution>
-							<id>attach-source</id>
-							<phase>process-classes</phase>
-							<goals>
-								<goal>plugin-source</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<useProjectSettings>true</useProjectSettings>
-						<encoding>UTF-8</encoding>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.0.2</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.1</version>
-					<configuration>
-						<encoding>ISO-8859-1</encoding>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.eclipse.tycho.extras</groupId>
-							<artifactId>tycho-sourceref-jgit</artifactId>
-							<version>${tycho-extras-version}</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<archiveSite>false</archiveSite>
-						<archive>
-							<addMavenDescriptor>false</addMavenDescriptor>
-						</archive>
-						<sourceReferences>
-							<generate>true</generate>
-						</sourceReferences>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-surefire-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<skip>${test.skip}</skip>
-						<useUIHarness>false</useUIHarness>
-						<failIfNoTests>true</failIfNoTests>
-						<forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds>
-						<product>org.eclipse.sdk.ide</product>
-						<application>org.eclipse.ui.ide.workbench</application>
-						<argLine>${tycho.testArgLine} -Xmx512m
-							-Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
-						<appArgLine>${test.args}</appArgLine>
-
-						<application>org.eclipse.ui.ide.workbench</application>
-						<dependency-resolution>
-							<extraRequirements>
-								<requirement>
-									<type>p2-installable-unit</type>
-									<id>org.eclipse.sdk.feature.group</id>
-								</requirement>
-							</extraRequirements>
-						</dependency-resolution>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/epub/ui/targets/.gitignore b/epub/ui/targets/.gitignore
deleted file mode 100644
index a2d2743..0000000
--- a/epub/ui/targets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-epub.target
diff --git a/epub/ui/targets/.project b/epub/ui/targets/.project
deleted file mode 100644
index 5e2ea31..0000000
--- a/epub/ui/targets/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.docs.epub.targets</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/epub/ui/targets/epub-development.target b/epub/ui/targets/epub-development.target
deleted file mode 100644
index 514e8c4..0000000
--- a/epub/ui/targets/epub-development.target
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="wikitext" sequenceNumber="16">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
-<repository location="file:/Users/torkild/Applications/Eclipse/mylyn-master/git/org.eclipse.mylyn.docs/epub/../wikitext/ui/org.eclipse.mylyn.wikitext-site/target/site"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.monitor.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.discovery.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.net" version="0.0.0"/>
-<unit id="org.apache.commons.codec" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.commons.lang" version="0.0.0"/>
-<unit id="org.apache.commons.httpclient" version="0.0.0"/>
-<unit id="org.apache.lucene.core" version="0.0.0"/>
-<unit id="org.apache.xerces" version="0.0.0"/>
-<unit id="org.apache.xml.resolver" version="0.0.0"/>
-<unit id="org.apache.xml.serializer" version="0.0.0"/>
-<repository location="http://download.eclipse.org/mylyn/releases/latest/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.concurrent" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.discovery.jmdns.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.tika.parsers" version="1.3.0.v201605180015"/>
-<unit id="org.apache.tika.core" version="1.3.0.v201505121915"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
-<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-<unit id="org.junit" version="4.12.0.v201504281640"/>
-<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
-<unit id="org.jsoup" version="1.7.2.v201411291515"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<unit id="org.mockito.source" version="1.9.5.v201605172210"/>
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.mockito" version="1.9.5.v201605172210"/>
-<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.junit.source" version="4.12.0.v201504281640"/>
-<unit id="org.objenesis" version="0.0.0"/>
-<unit id="org.hamcrest.integration" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
-</location>
-</locations>
-</target>
diff --git a/epub/ui/targets/epub.target-template b/epub/ui/targets/epub.target-template
deleted file mode 100644
index 34e7f7e..0000000
--- a/epub/ui/targets/epub.target-template
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="wikitext" sequenceNumber="12">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.docs.epub.ant" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.docs.epub.core" version="0.0.0"/>
-<repository location="file:EPUB_ROOT/core/repository/target/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
-<repository location="file:WIKITEXT_ROOT/ui/org.eclipse.mylyn.wikitext-site/target/site"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.monitor.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.discovery.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.identity.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.repositories.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.mylyn.commons.net" version="0.0.0"/>
-<unit id="org.apache.commons.codec" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.commons.lang" version="0.0.0"/>
-<unit id="org.apache.commons.httpclient" version="0.0.0"/>
-<unit id="org.apache.lucene.core" version="0.0.0"/>
-<unit id="org.apache.xerces" version="0.0.0"/>
-<unit id="org.apache.xml.resolver" version="0.0.0"/>
-<unit id="org.apache.xml.serializer" version="0.0.0"/>
-<repository location="http://download.eclipse.org/mylyn/releases/latest/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.tika.parsers" version="1.3.0.v201605180015"/>
-<unit id="org.apache.tika.core" version="1.3.0.v201505121915"/>
-<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
-<unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
-<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-<unit id="org.junit" version="4.12.0.v201504281640"/>
-<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
-<unit id="org.jsoup" version="1.7.2.v201411291515"/>
-<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-<unit id="org.mockito.source" version="1.9.5.v201605172210"/>
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.mockito" version="1.9.5.v201605172210"/>
-<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<unit id="org.junit.source" version="4.12.0.v201504281640"/>
-<unit id="org.objenesis" version="0.0.0"/>
-<unit id="org.hamcrest.integration" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.concurrent" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.discovery.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.discovery.jmdns.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
-</location>
-</locations>
-</target>
diff --git a/epub/ui/targets/pom.xml b/epub/ui/targets/pom.xml
deleted file mode 100644
index d411b25..0000000
--- a/epub/ui/targets/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.mylyn.docs</groupId>
-		<artifactId>epub.ui</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<name>EPUB target platform</name>
-	<artifactId>epub.ui.target</artifactId>
-	<packaging>pom</packaging>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>epub.target</file>
-									<type>target</type>
-									<classifier>epub</classifier>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/pom.xml b/pom.xml
index 510be89..4c38abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
 
   <modules>
     <module>wikitext</module>
-    <module>epub</module>
     <module>docs-pom.xml</module>
   </modules>
 </project>