diff --git a/NyaExtensions b/NyaExtensions
deleted file mode 160000
index 0608df4..0000000
--- a/NyaExtensions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0608df46c54df497f01bfe65f88d7bab3fca140c
diff --git a/NyaFs b/NyaFs
index e9b3ee8..5a837a9 160000
--- a/NyaFs
+++ b/NyaFs
@@ -1 +1 @@
-Subproject commit e9b3ee82de8af9dfb9b0b0b68e5b6d874bc5cbd2
+Subproject commit 5a837a9e0e3be4eea0412e0d58425a1142a64a4e
diff --git a/NyaFsTest/NyaFsTest.csproj b/NyaFsTest/NyaFsTest.csproj
index 9d0ddce..0a52497 100644
--- a/NyaFsTest/NyaFsTest.csproj
+++ b/NyaFsTest/NyaFsTest.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NyaFs\NyaFs.csproj" />
+    <ProjectReference Include="..\NyaFs\src\NyaFs\NyaFs.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NyaImageTool.sln b/NyaImageTool.sln
index b32b477..7fc710d 100644
--- a/NyaImageTool.sln
+++ b/NyaImageTool.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaExtensions", "NyaExtensions\NyaExtensions.csproj", "{578CE3A5-682A-466E-982F-DF676D6C78FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaExtensions", "NyaFs\src\submodules\NyaExtensions\NyaExtensions.csproj", "{578CE3A5-682A-466E-982F-DF676D6C78FE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFs", "NyaFs\NyaFs.csproj", "{17442459-436D-4B9E-8B4F-44D935B48A6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFs", "NyaFs\src\NyaFs\NyaFs.csproj", "{17442459-436D-4B9E-8B4F-44D935B48A6E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsTest", "NyaFsTest\NyaFsTest.csproj", "{1BA6938F-9B3A-4ADA-8AE6-E3CD8C7BA912}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaImageTool", "NyaImageToo
 		{433FCFC8-B750-4057-8B34-BFF8E598AABF} = {433FCFC8-B750-4057-8B34-BFF8E598AABF}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaLZO", "NyaLZO\NyaLZO.csproj", "{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaLZO", "NyaFs\src\submodules\NyaLZO\NyaLZO.csproj", "{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{7DE93B12-1E74-4204-A550-DDC4F3550AF9}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/NyaImageTool/NyaImageTool.csproj b/NyaImageTool/NyaImageTool.csproj
index ce0cc34..66509e4 100644
--- a/NyaImageTool/NyaImageTool.csproj
+++ b/NyaImageTool/NyaImageTool.csproj
@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Extensions\NyaExtensions.csproj" />
-    <ProjectReference Include="..\NyaFs\NyaFs.csproj" />
+    <ProjectReference Include="..\NyaFs\src\NyaFs\NyaFs.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NyaImageTool/Properties/launchSettings.json b/NyaImageTool/Properties/launchSettings.json
index dc358f4..2370467 100644
--- a/NyaImageTool/Properties/launchSettings.json
+++ b/NyaImageTool/Properties/launchSettings.json
@@ -1,8 +1,15 @@
 {
   "profiles": {
-    "NyaImageTool": {
+    "test_loaddir.nyas": {
       "commandName": "Project",
       "commandLineArgs": "test_loaddir.nyas"
+    },
+    "test_loadsqfs.nyas": {
+      "commandName": "Project",
+      "commandLineArgs": "test_loadsqfs.nyas"
+    },
+    "Interactive": {
+      "commandName": "Project"
     }
   }
 }
\ No newline at end of file
diff --git a/NyaLZO b/NyaLZO
deleted file mode 160000
index d7e80b4..0000000
--- a/NyaLZO
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7e80b4cd888744c3915b4a4b128e76bb2fb3e22
diff --git a/Plugins/NyaFsEncrypt/NyaFsEncrypt.csproj b/Plugins/NyaFsEncrypt/NyaFsEncrypt.csproj
index 11d2881..002d849 100644
--- a/Plugins/NyaFsEncrypt/NyaFsEncrypt.csproj
+++ b/Plugins/NyaFsEncrypt/NyaFsEncrypt.csproj
@@ -4,15 +4,12 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\NyaFs\NyaFs.csproj" />
-  </ItemGroup>
-
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy
-        SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb"
-        DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\"
-        SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
   </Target>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Plugins/NyaFsFiles/NyaFsFiles.csproj b/Plugins/NyaFsFiles/NyaFsFiles.csproj
index 94801df..002d849 100644
--- a/Plugins/NyaFsFiles/NyaFsFiles.csproj
+++ b/Plugins/NyaFsFiles/NyaFsFiles.csproj
@@ -4,15 +4,12 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\NyaFs\NyaFs.csproj" />
-  </ItemGroup>
-
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy
-        SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb"
-        DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\"
-        SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
   </Target>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Plugins/NyaFsLinux/NyaFsLinux.csproj b/Plugins/NyaFsLinux/NyaFsLinux.csproj
index 806ca60..9d63925 100644
--- a/Plugins/NyaFsLinux/NyaFsLinux.csproj
+++ b/Plugins/NyaFsLinux/NyaFsLinux.csproj
@@ -4,15 +4,12 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\NyaFs\NyaFs.csproj" />
-  </ItemGroup>
-
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy
-        SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb"
-        DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\"
-        SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
   </Target>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Plugins/NyaFsSftp/NyaFsSftp.csproj b/Plugins/NyaFsSftp/NyaFsSftp.csproj
index 806ca60..9d63925 100644
--- a/Plugins/NyaFsSftp/NyaFsSftp.csproj
+++ b/Plugins/NyaFsSftp/NyaFsSftp.csproj
@@ -4,15 +4,12 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\NyaFs\NyaFs.csproj" />
-  </ItemGroup>
-
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy
-        SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb"
-        DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\"
-        SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
   </Target>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Plugins/NyaFsTftp/NyaFsTftp.csproj b/Plugins/NyaFsTftp/NyaFsTftp.csproj
index 2b569b2..ad962c0 100644
--- a/Plugins/NyaFsTftp/NyaFsTftp.csproj
+++ b/Plugins/NyaFsTftp/NyaFsTftp.csproj
@@ -6,18 +6,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tftp.Net" Version="1.3.0"/>
+    <PackageReference Include="Tftp.Net" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NyaFs\NyaFs.csproj" />
+    <ProjectReference Include="..\..\NyaFs\src\NyaFs\NyaFs.csproj" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy
-        SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb;$(OutDir)\Tftp.Net.dll"
-        DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\"
-        SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(OutDir)\$(TargetName).dll;$(OutDir)\$(TargetName).pdb;$(OutDir)\Tftp.Net.dll" DestinationFolder="$(SolutionDir)\NyaImageTool\bin\Debug\netcoreapp3.1\plugins\" SkipUnchangedFiles="true" />
   </Target>
 
 </Project>