diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubBook.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubBook.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubBook.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubBook.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubByteContentFile.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubByteContentFile.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubByteContentFile.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubByteContentFile.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubChapter.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubChapter.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubChapter.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubChapter.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubContent.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContent.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubContent.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContent.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubContentFile.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContentFile.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubContentFile.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContentFile.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubContentType.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContentType.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubContentType.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubContentType.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubSchema.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubSchema.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubSchema.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubSchema.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Entities/EpubTextContentFile.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubTextContentFile.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Entities/EpubTextContentFile.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Entities/EpubTextContentFile.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/EpubReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/EpubReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/EpubReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/EpubReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/BookCoverReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/BookCoverReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/BookCoverReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/BookCoverReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/ChapterReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/ChapterReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/ChapterReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/ChapterReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/ContentReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/ContentReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/ContentReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/ContentReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/NavigationReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/NavigationReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/NavigationReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/NavigationReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/PackageReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/PackageReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/PackageReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/PackageReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/RootFilePathReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/RootFilePathReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/RootFilePathReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/RootFilePathReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Readers/SchemaReader.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/SchemaReader.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Readers/SchemaReader.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Readers/SchemaReader.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubBookRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubBookRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubBookRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubBookRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubByteContentFileRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubByteContentFileRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubByteContentFileRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubByteContentFileRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubChapterRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubChapterRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubChapterRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubChapterRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubContentFileRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubContentFileRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubContentFileRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubContentFileRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubContentRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubContentRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubContentRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubContentRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/RefEntities/EpubTextContentFileRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubTextContentFileRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/RefEntities/EpubTextContentFileRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/RefEntities/EpubTextContentFileRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigation.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigation.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigation.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigation.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationContent.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationContent.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationContent.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationContent.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationDocAuthor.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationDocAuthor.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationDocAuthor.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationDocAuthor.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationDocTitle.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationDocTitle.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationDocTitle.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationDocTitle.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationHead.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationHead.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationHead.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationHead.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationHeadMeta.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationHeadMeta.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationHeadMeta.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationHeadMeta.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationLabel.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationLabel.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationLabel.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationLabel.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationList.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationList.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationList.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationList.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationMap.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationMap.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationMap.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationMap.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageList.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageList.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageList.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageList.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageTarget.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageTarget.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageTarget.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageTarget.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageTargetType.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageTargetType.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPageTargetType.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPageTargetType.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPoint.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPoint.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationPoint.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationPoint.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationTarget.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationTarget.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Navigation/EpubNavigationTarget.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Navigation/EpubNavigationTarget.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubGuide.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubGuide.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubGuide.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubGuide.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubGuideReference.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubGuideReference.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubGuideReference.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubGuideReference.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubManifest.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubManifest.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubManifest.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubManifest.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubManifestItem.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubManifestItem.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubManifestItem.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubManifestItem.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadata.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadata.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadata.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadata.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataContributor.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataContributor.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataContributor.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataContributor.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataCreator.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataCreator.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataCreator.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataCreator.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataDate.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataDate.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataDate.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataDate.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataIdentifier.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataIdentifier.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataIdentifier.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataIdentifier.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataMeta.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataMeta.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubMetadataMeta.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubMetadataMeta.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubPackage.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubPackage.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubPackage.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubPackage.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubSpine.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubSpine.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubSpine.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubSpine.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubSpineItemRef.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubSpineItemRef.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubSpineItemRef.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubSpineItemRef.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubVersion.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubVersion.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Schema/Opf/EpubVersion.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Schema/Opf/EpubVersion.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Utils/XmlUtils.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Utils/XmlUtils.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Utils/XmlUtils.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Utils/XmlUtils.cs
diff --git a/QuickLook.Plugin/VersOne.Epub/Utils/ZipPathUtils.cs b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Utils/ZipPathUtils.cs
similarity index 100%
rename from QuickLook.Plugin/VersOne.Epub/Utils/ZipPathUtils.cs
rename to QuickLook.Plugin/QuickLook.Plugin.EpubViewer/EpubReader/Utils/ZipPathUtils.cs
diff --git a/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/QuickLook.Plugin.EpubViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/QuickLook.Plugin.EpubViewer.csproj
index 3113937..78ecc86 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/QuickLook.Plugin.EpubViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/QuickLook.Plugin.EpubViewer.csproj
@@ -42,6 +42,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
@@ -56,6 +60,58 @@
     <Compile Include="..\..\GitVersion.cs">
       <Link>Properties\GitVersion.cs</Link>
     </Compile>
+    <Compile Include="EpubReader\Entities\EpubBook.cs" />
+    <Compile Include="EpubReader\Entities\EpubByteContentFile.cs" />
+    <Compile Include="EpubReader\Entities\EpubChapter.cs" />
+    <Compile Include="EpubReader\Entities\EpubContent.cs" />
+    <Compile Include="EpubReader\Entities\EpubContentFile.cs" />
+    <Compile Include="EpubReader\Entities\EpubContentType.cs" />
+    <Compile Include="EpubReader\Entities\EpubSchema.cs" />
+    <Compile Include="EpubReader\Entities\EpubTextContentFile.cs" />
+    <Compile Include="EpubReader\EpubReader.cs" />
+    <Compile Include="EpubReader\Readers\BookCoverReader.cs" />
+    <Compile Include="EpubReader\Readers\ChapterReader.cs" />
+    <Compile Include="EpubReader\Readers\ContentReader.cs" />
+    <Compile Include="EpubReader\Readers\NavigationReader.cs" />
+    <Compile Include="EpubReader\Readers\PackageReader.cs" />
+    <Compile Include="EpubReader\Readers\RootFilePathReader.cs" />
+    <Compile Include="EpubReader\Readers\SchemaReader.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubBookRef.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubByteContentFileRef.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubChapterRef.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubContentFileRef.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubContentRef.cs" />
+    <Compile Include="EpubReader\RefEntities\EpubTextContentFileRef.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigation.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationContent.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationDocAuthor.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationDocTitle.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationHead.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationHeadMeta.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationLabel.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationList.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationMap.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationPageList.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationPageTarget.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationPageTargetType.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationPoint.cs" />
+    <Compile Include="EpubReader\Schema\Navigation\EpubNavigationTarget.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubGuide.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubGuideReference.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubManifest.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubManifestItem.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadata.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadataContributor.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadataCreator.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadataDate.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadataIdentifier.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubMetadataMeta.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubPackage.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubSpine.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubSpineItemRef.cs" />
+    <Compile Include="EpubReader\Schema\Opf\EpubVersion.cs" />
+    <Compile Include="EpubReader\Utils\XmlUtils.cs" />
+    <Compile Include="EpubReader\Utils\ZipPathUtils.cs" />
     <Compile Include="EpubViewerControl.xaml.cs">
       <DependentUpon>EpubViewerControl.xaml</DependentUpon>
     </Compile>
@@ -71,10 +127,6 @@
       <Project>{ce22a1f3-7f2c-4ec8-bfde-b58d0eb625fc}</Project>
       <Name>QuickLook.Plugin.HtmlViewer</Name>
     </ProjectReference>
-    <ProjectReference Include="..\VersOne.Epub\VersOne.Epub.csproj">
-      <Project>{8bfc120e-7e59-437c-9196-595ab00025e1}</Project>
-      <Name>VersOne.Epub</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="EpubViewerControl.xaml">
diff --git a/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/packages.config b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/packages.config
index dd2ff0c..37d44cc 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/packages.config
+++ b/QuickLook.Plugin/QuickLook.Plugin.EpubViewer/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="HtmlRenderer.Core" version="1.5.0.6" targetFramework="net461" />
   <package id="HtmlRenderer.WPF" version="1.5.0.6" targetFramework="net461" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.csproj b/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.csproj
deleted file mode 100644
index 63aecd5..0000000
--- a/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
-        <Authors>vers</Authors>
-        <Company />
-        <Product />
-        <Description />
-        <Copyright>vers, 2015-2018</Copyright>
-        <Version>2.0.4</Version>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    </ItemGroup>
-</Project>
diff --git a/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.nuspec b/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.nuspec
deleted file mode 100644
index 4f84ddc..0000000
--- a/QuickLook.Plugin/VersOne.Epub/VersOne.Epub.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-    <metadata>
-        <id>VersOne.Epub</id>
-        <version>2.0.4</version>
-        <title>EPUB reader</title>
-        <description>.NET library for reading EPUB files</description>
-        <authors>vers</authors>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <licenseUrl>https://github.com/vers-one/EpubReader/blob/master/LICENSE</licenseUrl>
-        <projectUrl>https://github.com/vers-one/EpubReader</projectUrl>
-        <releaseNotes>.NET Standard 1.3 support.</releaseNotes>
-        <copyright>Unlicense &lt;http://unlicense.org&gt;</copyright>
-        <tags>epub</tags>
-        <dependencies>
-            <group targetFramework="net45">
-            </group>
-            <group targetFramework="netcoreapp1.0">
-                <dependency id="System.IO.Compression" version="4.3.0" exclude="Build,Analyzers" />
-            </group>
-            <group targetFramework="netstandard1.3">
-                <dependency id="System.IO.Compression" version="4.3.0" exclude="Build,Analyzers" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="bin\Release\net45\VersOne.Epub.dll" target="lib\net45" />
-        <file src="bin\Release\netcoreapp1.0\VersOne.Epub.dll" target="lib\netcoreapp1.0" />
-        <file src="bin\Release\netstandard1.3\VersOne.Epub.dll" target="lib\netstandard1.3" />
-    </files>
-</package>
diff --git a/QuickLook.sln b/QuickLook.sln
index 1f2852f..f7a3588 100644
--- a/QuickLook.sln
+++ b/QuickLook.sln
@@ -74,8 +74,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.CameraRawV
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickLook.Plugin.EpubViewer", "QuickLook.Plugin\QuickLook.Plugin.EpubViewer\QuickLook.Plugin.EpubViewer.csproj", "{260C9E70-0582-471F-BFB5-022CFE7984C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersOne.Epub", "QuickLook.Plugin\VersOne.Epub\VersOne.Epub.csproj", "{8BFC120E-7E59-437C-9196-595AB00025E1}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -222,14 +220,6 @@ Global
 		{260C9E70-0582-471F-BFB5-022CFE7984C8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{260C9E70-0582-471F-BFB5-022CFE7984C8}.Release|x86.ActiveCfg = Release|Any CPU
 		{260C9E70-0582-471F-BFB5-022CFE7984C8}.Release|x86.Build.0 = Release|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{8BFC120E-7E59-437C-9196-595AB00025E1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -250,7 +240,6 @@ Global
 		{45E94893-3076-4A8E-8969-6955B6340739} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{BD58F3FC-7601-47BA-AAA1-D8A9D54A33DA} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 		{260C9E70-0582-471F-BFB5-022CFE7984C8} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
-		{8BFC120E-7E59-437C-9196-595AB00025E1} = {06EFDBE0-6408-4B37-BCF2-0CF9EBEA2E93}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D3761C32-8C5F-498A-892B-3B0882994B62}