diff --git a/.gitignore b/.gitignore
index 70cf9a8..6e5b49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ obj/
 .vshistory/
 .editorconfig
 *.user
+*.vcxproj.filters
 .config
diff --git a/kerep.vcxproj b/kerep.vcxproj
index e79f56e..0953edf 100644
--- a/kerep.vcxproj
+++ b/kerep.vcxproj
@@ -18,6 +18,59 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\Autoarr2\Autoarr2_instances.cpp" />
+    <ClCompile Include="src\Autoarr\Autoarr.c" />
+    <ClCompile Include="src\Autoarr\Autoarr_KVPair_exported.c" />
+    <ClCompile Include="src\Autoarr\Autoarr_Unitype_exported.c" />
+    <ClCompile Include="src\base\cptr.c" />
+    <ClCompile Include="src\base\errors.c" />
+    <ClCompile Include="src\base\types.c" />
+    <ClCompile Include="src\DtsodParser\DtsodV24.c" />
+    <ClCompile Include="src\DtsodParser\DtsodV24_deserialize.c" />
+    <ClCompile Include="src\DtsodParser\DtsodV24_exported.c" />
+    <ClCompile Include="src\DtsodParser\DtsodV24_serialize.c" />
+    <ClCompile Include="src\Hashtable\hash.c" />
+    <ClCompile Include="src\Hashtable\Hashtable.c" />
+    <ClCompile Include="src\Hashtable\KeyValuePair.c" />
+    <ClCompile Include="src\Network\knSocket.c" />
+    <ClCompile Include="src\SearchTree\SearchTree.c" />
+    <ClCompile Include="src\String\string.c" />
+    <ClCompile Include="src\String\StringBuilder.c" />
+    <ClCompile Include="tests\main.cpp" />
+    <ClCompile Include="tests\test_autoarr.c" />
+    <ClCompile Include="tests\test_autoarr2.cpp" />
+    <ClCompile Include="tests\test_dtsod.c" />
+    <ClCompile Include="tests\test_hashtable.c" />
+    <ClCompile Include="tests\test_marshalling.c" />
+    <ClCompile Include="tests\test_safethrow.c" />
+    <ClCompile Include="tests\test_searchtree.c" />
+    <ClCompile Include="tests\test_string.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\Autoarr2\Autoarr2.hpp" />
+    <ClInclude Include="src\Autoarr2\Autoarr2_methods.hpp" />
+    <ClInclude Include="src\Autoarr\Autoarr.h" />
+    <ClInclude Include="src\Autoarr\Autoarr_declare.h" />
+    <ClInclude Include="src\Autoarr\Autoarr_define.h" />
+    <ClInclude Include="src\base\base.h" />
+    <ClInclude Include="src\base\cptr.h" />
+    <ClInclude Include="src\base\errors.h" />
+    <ClInclude Include="src\base\optime.h" />
+    <ClInclude Include="src\base\std.h" />
+    <ClInclude Include="src\base\types.h" />
+    <ClInclude Include="src\DtsodParser\DtsodV24.h" />
+    <ClInclude Include="src\Hashtable2\Hashtable2.hpp" />
+    <ClInclude Include="src\Hashtable2\Hashtable2_methods.hpp" />
+    <ClInclude Include="src\Hashtable\hash.h" />
+    <ClInclude Include="src\Hashtable\Hashtable.h" />
+    <ClInclude Include="src\Hashtable\KeyValuePair.h" />
+    <ClInclude Include="src\Network\network.h" />
+    <ClInclude Include="src\SearchTree\SearchTree.h" />
+    <ClInclude Include="src\String\string.h" />
+    <ClInclude Include="src\String\StringBuilder.h" />
+    <ClInclude Include="tests\tests.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -201,53 +254,6 @@
       <EnableUAC>false</EnableUAC>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\Autoarr\Autoarr.h" />
-    <ClInclude Include="src\Autoarr\Autoarr_declare.h" />
-    <ClInclude Include="src\Autoarr\Autoarr_define.h" />
-    <ClInclude Include="src\base\base.h" />
-    <ClInclude Include="src\base\cptr.h" />
-    <ClInclude Include="src\base\errors.h" />
-    <ClInclude Include="src\base\std.h" />
-    <ClInclude Include="src\base\types.h" />
-    <ClInclude Include="src\DtsodParser\DtsodV24.h" />
-    <ClInclude Include="src\Hashtable\hash.h" />
-    <ClInclude Include="src\Hashtable\Hashtable.h" />
-    <ClInclude Include="src\Hashtable\KeyValuePair.h" />
-    <ClInclude Include="src\Network\network.h" />
-    <ClInclude Include="src\SearchTree\SearchTree.h" />
-    <ClInclude Include="src\String\string.h" />
-    <ClInclude Include="src\String\StringBuilder.h" />
-    <ClInclude Include="tests\tests.h" />
-    <ClInclude Include="tests\test_marshalling.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\Autoarr\Autoarr.c" />
-    <ClCompile Include="src\Autoarr\Autoarr_KVPair_exported.c" />
-    <ClCompile Include="src\Autoarr\Autoarr_Unitype_exported.c" />
-    <ClCompile Include="src\base\cptr.c" />
-    <ClCompile Include="src\base\errors.c" />
-    <ClCompile Include="src\base\types.c" />
-    <ClCompile Include="src\DtsodParser\DtsodV24.c" />
-    <ClCompile Include="src\DtsodParser\DtsodV24_deserialize.c" />
-    <ClCompile Include="src\DtsodParser\DtsodV24_exported.c" />
-    <ClCompile Include="src\DtsodParser\DtsodV24_serialize.c" />
-    <ClCompile Include="src\Hashtable\hash.c" />
-    <ClCompile Include="src\Hashtable\Hashtable.c" />
-    <ClCompile Include="src\Hashtable\KeyValuePair.c" />
-    <ClCompile Include="src\Network\knSocket.c" />
-    <ClCompile Include="src\SearchTree\SearchTree.c" />
-    <ClCompile Include="src\String\string.c" />
-    <ClCompile Include="src\String\StringBuilder.c" />
-    <ClCompile Include="tests\main.c" />
-    <ClCompile Include="tests\test_autoarr.c" />
-    <ClCompile Include="tests\test_dtsod.c" />
-    <ClCompile Include="tests\test_hashtable.c" />
-    <ClCompile Include="tests\test_marshalling.c" />
-    <ClCompile Include="tests\test_safethrow.c" />
-    <ClCompile Include="tests\test_searchtree.c" />
-    <ClCompile Include="tests\test_string.c" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/kerep.vcxproj.filters b/kerep.vcxproj.filters
deleted file mode 100644
index 3785ed4..0000000
--- a/kerep.vcxproj.filters
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Исходные файлы">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Файлы заголовков">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="tests\test_marshalling.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="tests\tests.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Autoarr\Autoarr.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Autoarr\Autoarr_declare.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Autoarr\Autoarr_define.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\base\base.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\base\cptr.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\base\errors.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\base\std.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\base\types.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DtsodParser\DtsodV24.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Hashtable\hash.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Hashtable\Hashtable.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Hashtable\KeyValuePair.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Network\network.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SearchTree\SearchTree.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\String\string.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="src\String\StringBuilder.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="tests\main.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_autoarr.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_dtsod.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_hashtable.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_searchtree.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_string.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_marshalling.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="tests\test_safethrow.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Autoarr\Autoarr.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Autoarr\Autoarr_KVPair_exported.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Autoarr\Autoarr_Unitype_exported.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\base\cptr.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\base\errors.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\base\types.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DtsodParser\DtsodV24.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DtsodParser\DtsodV24_deserialize.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DtsodParser\DtsodV24_exported.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DtsodParser\DtsodV24_serialize.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Hashtable\hash.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Hashtable\Hashtable.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Hashtable\KeyValuePair.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Network\knSocket.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SearchTree\SearchTree.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\String\string.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="src\String\StringBuilder.c">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file