diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ExtraDataFields/ZIPExtraDataFieldExtendedTimestamp.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ExtraDataFields/ZIPExtraDataFieldExtendedTimestamp.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ExtraDataFields/ZIPExtraDataFieldExtendedTimestamp.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ExtraDataFields/ZIPExtraDataFieldExtendedTimestamp.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/Internal/ZIPCentralDirectoryFooter.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/Internal/ZIPCentralDirectoryFooter.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/Internal/ZIPCentralDirectoryFooter.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/Internal/ZIPCentralDirectoryFooter.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPCompressionMethod.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPCompressionMethod.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPCompressionMethod.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPCompressionMethod.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPCreationPlatform.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPCreationPlatform.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPCreationPlatform.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPCreationPlatform.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPDataFormat.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPDataFormat.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPDataFormat.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPDataFormat.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPExtraDataField.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPExtraDataField.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPExtraDataField.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPExtraDataField.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPExtraDataFieldType.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPExtraDataFieldType.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPExtraDataFieldType.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPExtraDataFieldType.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPGeneralPurposeFlags.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPGeneralPurposeFlags.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPGeneralPurposeFlags.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPGeneralPurposeFlags.cs
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPInternalFileAttributes.cs b/Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPInternalFileAttributes.cs
similarity index 100%
rename from Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/ZIP/ZIPInternalFileAttributes.cs
rename to Libraries/UniversalEditor.Essential/DataFormats/FileSystem/ZIP/ZIPInternalFileAttributes.cs
diff --git a/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
index 4aad0b72..6035083a 100644
--- a/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
+++ b/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
@@ -206,6 +206,15 @@
     <Compile Include="ObjectModels\Package\PackageObjectModel.cs" />
     <Compile Include="ObjectModels\Package\Relationships\Relationship.cs" />
     <Compile Include="ObjectModels\Package\Relationships\RelationshipsObjectModel.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ExtraDataFields\ZIPExtraDataFieldExtendedTimestamp.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\Internal\ZIPCentralDirectoryFooter.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPCompressionMethod.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPCreationPlatform.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPDataFormat.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPExtraDataField.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPExtraDataFieldType.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPGeneralPurposeFlags.cs" />
+    <Compile Include="DataFormats\FileSystem\ZIP\ZIPInternalFileAttributes.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UniversalEditor.Core\UniversalEditor.Core.csproj">
@@ -233,6 +242,8 @@
     <Folder Include="DataFormats\JSON\" />
     <Folder Include="Accessors\" />
     <Folder Include="ObjectModels\Package\" />
+    <Folder Include="DataFormats\FileSystem\" />
+    <Folder Include="DataFormats\FileSystem\ZIP\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj b/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
index a69dda43..564b8595 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
+++ b/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
@@ -204,17 +204,8 @@
     <Compile Include="DataFormats\FileSystem\ZipTV\BlakHole\BHDataFormat.cs" />
     <Compile Include="DataFormats\FileSystem\ZipTV\BlakHole\BHEncryptDecrypt.cs" />
     <Compile Include="DataFormats\FileSystem\ZipTV\BlakHole\BHEncryptionMethod.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\Internal\ZIPCentralDirectoryFooter.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPCreationPlatform.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPDataFormat.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPGeneralPurposeFlags.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPInternalFileAttributes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DataFormats\FileSystem\VirtualBox\VDIDataFormat.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPCompressionMethod.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPExtraDataField.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ExtraDataFields\ZIPExtraDataFieldExtendedTimestamp.cs" />
-    <Compile Include="DataFormats\FileSystem\ZIP\ZIPExtraDataFieldType.cs" />
     <Compile Include="DataFormats\FileSystem\Apogee\DLTDataFormat.cs" />
     <Compile Include="DataFormats\FileSystem\PAC\PACDataFormat.cs" />
     <Compile Include="DataFormats\FileSystem\MechCommander\MechCommanderDataFormat.cs" />
@@ -288,7 +279,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DataFormats\FileSystem\VirtualBox\" />
-    <Folder Include="DataFormats\FileSystem\ZIP\ExtraDataFields\" />
     <Folder Include="DataFormats\FileSystem\Apogee\" />
     <Folder Include="DataFormats\FileSystem\PAC\" />
     <Folder Include="DataFormats\FileSystem\MechCommander\" />