diff --git a/DTLib.Tests/DTLib.Tests.csproj b/DTLib.Tests/DTLib.Tests.csproj
index 816cd98..3e5e4e1 100644
--- a/DTLib.Tests/DTLib.Tests.csproj
+++ b/DTLib.Tests/DTLib.Tests.csproj
@@ -11,7 +11,7 @@
 		<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
 		<RootNamespace>DTLib.Tests</RootNamespace>
 		<Configurations>Debug;Release;Release-net48</Configurations>
-		<Platforms>AnyCPU</Platforms>
+		<Platforms>AnyCPU;x64;x86;arm64</Platforms>
 	</PropertyGroup>
 	
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
@@ -28,22 +28,7 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-	  <None Include="DtsodV23\*">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Include="DtsodV30\*">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="DtsodV24\base_types.dtsod">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="DtsodV24\complexes.dtsod">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="DtsodV24\lists.dtsod">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="DtsodV24\messages.dtsod">
+	  <None Update="Dtsod\TestResources\**\*">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
 	</ItemGroup>
diff --git a/DTLib.Tests/DtsodV24/TestAutoarr.cs b/DTLib.Tests/Dtsod/TestAutoarr.cs
similarity index 100%
rename from DTLib.Tests/DtsodV24/TestAutoarr.cs
rename to DTLib.Tests/Dtsod/TestAutoarr.cs
diff --git a/DTLib.Tests/DtsodV23/TestDtsodV23.cs b/DTLib.Tests/Dtsod/TestDtsodV23.cs
similarity index 73%
rename from DTLib.Tests/DtsodV23/TestDtsodV23.cs
rename to DTLib.Tests/Dtsod/TestDtsodV23.cs
index 2311d1b..b84d46e 100644
--- a/DTLib.Tests/DtsodV23/TestDtsodV23.cs
+++ b/DTLib.Tests/Dtsod/TestDtsodV23.cs
@@ -17,7 +17,7 @@ public static class TestDtsodV23
     public static void TestBaseTypes()
     {
         Info.Log("c", "-----[TestDtsodV23/TestBaseTypes]-----");
-        DtsodV23 dtsod = new(File.ReadAllText($"DtsodV23{Путь.Разд}base_types.dtsod"));
+        DtsodV23 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}base_types.dtsod"));
         foreach (var pair in dtsod)
             Info.LogNoTime("b", pair.Value.GetType().Name + ' ', "w", pair.Key + ' ', "c", pair.Value.ToString());
         Info.Log("g", "test completed");
@@ -25,7 +25,7 @@ public static class TestDtsodV23
     public static void TestLists()
     {
         Info.Log("c", "-------[TestDtsodV23/TestLists]-------");
-        DtsodV23 dtsod = new(File.ReadAllText($"DtsodV23{Путь.Разд}lists.dtsod"));
+        DtsodV23 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}lists.dtsod"));
         foreach (var pair in dtsod)
         {
             Info.LogNoTime("b",  pair.Value.GetType().Name + ' ', "w", pair.Key, "c",
@@ -39,7 +39,7 @@ public static class TestDtsodV23
     public static void TestComplexes()
     {
         Info.Log("c", "-----[TestDtsodV23/TestComplexes]-----");
-        DtsodV23 dtsod = new(File.ReadAllText($"DtsodV23{Путь.Разд}complexes.dtsod"));
+        DtsodV23 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}complexes.dtsod"));
         foreach (var pair in dtsod)
         {
             Info.LogNoTime("b", pair.Value.GetType().Name + ' ', "w", pair.Key, 
@@ -53,7 +53,7 @@ public static class TestDtsodV23
     {
         Info.Log("c", "--[TestDtsodV23/TestReSerialization]--");
         var dtsod = new DtsodV23(new DtsodV23(new DtsodV23(
-            new DtsodV23(File.ReadAllText($"DtsodV23{Путь.Разд}complexes.dtsod")).ToString()).ToString()).ToString());
+            new DtsodV23(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}complexes.dtsod")).ToString()).ToString()).ToString());
         Info.Log("y", dtsod.ToString());
         Info.Log("g", "test completed");
     }
@@ -62,7 +62,7 @@ public static class TestDtsodV23
     {
         Info.Log("c", "-------[TestDtsodV23/TestSpeed]-------");
         IDtsod dtsod=null;
-        string text = File.ReadAllText($"DtsodV23{Путь.Разд}messages.dtsod");
+        string text = File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}messages.dtsod");
         LogOperationTime("V21 deserialization",64,()=>dtsod=new DtsodV21(text));
         LogOperationTime("V21 serialization", 64, () => _=dtsod.ToString());
         LogOperationTime("V23 deserialization", 64, () => dtsod = new DtsodV23(text));
@@ -73,7 +73,7 @@ public static class TestDtsodV23
     public static void TestMemoryConsumption()
     {
         Info.Log("c", "----[TestDtsodV23/TestMemConsumpt]----");
-        string text = File.ReadAllText($"DtsodV23{Путь.Разд}messages.dtsod");
+        string text = File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}messages.dtsod");
         var a = GC.GetTotalMemory(true);
         var dtsods = new DtsodV23[64];
         for (int i = 0; i < dtsods.Length; i++)
diff --git a/DTLib.Tests/DtsodV24/TestDtsodV24.cs b/DTLib.Tests/Dtsod/TestDtsodV24.cs
similarity index 70%
rename from DTLib.Tests/DtsodV24/TestDtsodV24.cs
rename to DTLib.Tests/Dtsod/TestDtsodV24.cs
index 97fd545..ea77d63 100644
--- a/DTLib.Tests/DtsodV24/TestDtsodV24.cs
+++ b/DTLib.Tests/Dtsod/TestDtsodV24.cs
@@ -18,7 +18,7 @@ public static class TestDtsodV24
     public static void TestBaseTypes()
     {
         Info.Log("c", "-----[TestDtsodV24/TestBaseTypes]-----");
-        DtsodV24 dtsod = new(File.ReadAllText($"DtsodV24{Путь.Разд}base_types.dtsod"));
+        DtsodV24 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV24{Путь.Разд}base_types.dtsod"));
         foreach (var pair in dtsod)
             Info.LogNoTime("b", pair.ToString());
         Info.Log("g", "test completed");
@@ -27,7 +27,7 @@ public static class TestDtsodV24
     public static void TestComplexes()
     {
         Info.Log("c", "-----[TestDtsodV24/TestComplexes]-----");
-        DtsodV24 dtsod = new(File.ReadAllText($"DtsodV24{Путь.Разд}complexes.dtsod"));
+        DtsodV24 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV24{Путь.Разд}complexes.dtsod"));
         Info.Log("h", dtsod.ToString());
         Info.Log("g", "test completed");
     }
@@ -35,7 +35,7 @@ public static class TestDtsodV24
     public static void TestLists()
     {
         Info.Log("c", "-------[TestDtsodV24/TestLists]-------");
-        DtsodV24 dtsod = new(File.ReadAllText($"DtsodV24{Путь.Разд}lists.dtsod"));
+        DtsodV24 dtsod = new(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV24{Путь.Разд}lists.dtsod"));
         foreach (KVPair pair in dtsod)
         {
             var list = new Autoarr<Unitype>(pair.value.VoidPtr, false);
@@ -60,7 +60,7 @@ public static class TestDtsodV24
     {
         Info.Log("c", "--[TestDtsodV24/TestReSerialization]--");
         var dtsod = new DtsodV24(new DtsodV24(new DtsodV24(
-            new DtsodV24(File.ReadAllText($"DtsodV24{Путь.Разд}complexes.dtsod")).ToString()).ToString()).ToString());
+            new DtsodV24(File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV24{Путь.Разд}complexes.dtsod")).ToString()).ToString()).ToString());
         Info.Log("h", dtsod.ToString());
         Info.Log("g", "test completed");
     }
@@ -69,12 +69,12 @@ public static class TestDtsodV24
     {
         Info.Log("c", "-------[TestDtsodV24/TestSpeed]-------");
         IDtsod dtsod=null;
-        string _text = File.ReadAllText($"DtsodV23{Путь.Разд}messages.dtsod");
+        string _text = File.ReadAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV23{Путь.Разд}messages.dtsod");
         string text = "";
         LogOperationTime( "V23 to V24 conversion", 32, ()=>
             text = DtsodConverter.ConvertVersion(new DtsodV23(_text), DtsodVersion.V24).ToString()
         );
-        File.WriteAllText($"DtsodV24{Путь.Разд}messages.dtsod",text);
+        File.WriteAllText($"Dtsod{Путь.Разд}TestResources{Путь.Разд}DtsodV24{Путь.Разд}messages.dtsod",text);
         LogOperationTime("V24 deserialization", 64, () => dtsod = new DtsodV24(text));
         LogOperationTime("V24 serialization", 64, () => text = dtsod.ToString());
         Info.Log("g", "test completed");
diff --git a/DTLib.Tests/DtsodV24/TestPInvoke.cs b/DTLib.Tests/Dtsod/TestPInvoke.cs
similarity index 100%
rename from DTLib.Tests/DtsodV24/TestPInvoke.cs
rename to DTLib.Tests/Dtsod/TestPInvoke.cs
diff --git a/DTLib.Tests/DtsodV23/base_types.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV23/base_types.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV23/base_types.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV23/base_types.dtsod
diff --git a/DTLib.Tests/DtsodV23/complexes.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV23/complexes.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV23/complexes.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV23/complexes.dtsod
diff --git a/DTLib.Tests/DtsodV23/lists.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV23/lists.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV23/lists.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV23/lists.dtsod
diff --git a/DTLib.Tests/DtsodV23/messages.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV23/messages.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV23/messages.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV23/messages.dtsod
diff --git a/DTLib.Tests/DtsodV24/base_types.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV24/base_types.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV24/base_types.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV24/base_types.dtsod
diff --git a/DTLib.Tests/DtsodV24/complexes.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV24/complexes.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV24/complexes.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV24/complexes.dtsod
diff --git a/DTLib.Tests/DtsodV24/lists.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV24/lists.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV24/lists.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV24/lists.dtsod
diff --git a/DTLib.Tests/DtsodV24/messages.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV24/messages.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV24/messages.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV24/messages.dtsod
diff --git a/DTLib.Tests/DtsodV30/base_types.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV30/base_types.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV30/base_types.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV30/base_types.dtsod
diff --git a/DTLib.Tests/DtsodV30/enumerables.dtsod b/DTLib.Tests/Dtsod/TestResources/DtsodV30/enumerables.dtsod
similarity index 100%
rename from DTLib.Tests/DtsodV30/enumerables.dtsod
rename to DTLib.Tests/Dtsod/TestResources/DtsodV30/enumerables.dtsod