diff --git a/Modules.Filesystem/Compression.vb b/Modules.Filesystem/Encryption/Compression.vb
similarity index 100%
rename from Modules.Filesystem/Compression.vb
rename to Modules.Filesystem/Encryption/Compression.vb
diff --git a/Modules.Filesystem/Encryption.vb b/Modules.Filesystem/Encryption/Encryption.vb
similarity index 100%
rename from Modules.Filesystem/Encryption.vb
rename to Modules.Filesystem/Encryption/Encryption.vb
diff --git a/Modules.Filesystem/EncryptionLegacy.vb b/Modules.Filesystem/Encryption/EncryptionLegacy.vb
similarity index 100%
rename from Modules.Filesystem/EncryptionLegacy.vb
rename to Modules.Filesystem/Encryption/EncryptionLegacy.vb
diff --git a/Modules.Filesystem/DocumentObject.vb b/Modules.Filesystem/FileContainer/DocumentObject.vb
similarity index 100%
rename from Modules.Filesystem/DocumentObject.vb
rename to Modules.Filesystem/FileContainer/DocumentObject.vb
diff --git a/Modules.Filesystem/FileContainer.vb b/Modules.Filesystem/FileContainer/FileContainer.vb
similarity index 100%
rename from Modules.Filesystem/FileContainer.vb
rename to Modules.Filesystem/FileContainer/FileContainer.vb
diff --git a/Modules.Filesystem/FileContainerInner.vb b/Modules.Filesystem/FileContainer/FileContainerInner.vb
similarity index 100%
rename from Modules.Filesystem/FileContainerInner.vb
rename to Modules.Filesystem/FileContainer/FileContainerInner.vb
diff --git a/Modules.Filesystem/FileWatcher.vb b/Modules.Filesystem/FileWatcher/FileWatcher.vb
similarity index 100%
rename from Modules.Filesystem/FileWatcher.vb
rename to Modules.Filesystem/FileWatcher/FileWatcher.vb
diff --git a/Modules.Filesystem/FileWatcherFilters.vb b/Modules.Filesystem/FileWatcher/FileWatcherFilters.vb
similarity index 100%
rename from Modules.Filesystem/FileWatcherFilters.vb
rename to Modules.Filesystem/FileWatcher/FileWatcherFilters.vb
diff --git a/Modules.Filesystem/FileWatcherProperties.vb b/Modules.Filesystem/FileWatcher/FileWatcherProperties.vb
similarity index 100%
rename from Modules.Filesystem/FileWatcherProperties.vb
rename to Modules.Filesystem/FileWatcher/FileWatcherProperties.vb
diff --git a/Modules.Filesystem/Filesystem.vbproj b/Modules.Filesystem/Filesystem.vbproj
index 82346224..8c1f2d56 100644
--- a/Modules.Filesystem/Filesystem.vbproj
+++ b/Modules.Filesystem/Filesystem.vbproj
@@ -75,16 +75,16 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Compression.vb" />
-    <Compile Include="DocumentObject.vb" />
-    <Compile Include="EncryptionLegacy.vb" />
-    <Compile Include="FileContainer.vb" />
-    <Compile Include="Encryption.vb" />
+    <Compile Include="Encryption\Compression.vb" />
+    <Compile Include="FileContainer\DocumentObject.vb" />
+    <Compile Include="Encryption\EncryptionLegacy.vb" />
+    <Compile Include="FileContainer\FileContainer.vb" />
+    <Compile Include="Encryption\Encryption.vb" />
     <Compile Include="File.vb" />
-    <Compile Include="FileContainerInner.vb" />
-    <Compile Include="FileWatcher.vb" />
-    <Compile Include="FileWatcherFilters.vb" />
-    <Compile Include="FileWatcherProperties.vb" />
+    <Compile Include="FileContainer\FileContainerInner.vb" />
+    <Compile Include="FileWatcher\FileWatcher.vb" />
+    <Compile Include="FileWatcher\FileWatcherFilters.vb" />
+    <Compile Include="FileWatcher\FileWatcherProperties.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>