diff --git a/external/ton/CMakeLists.txt b/external/ton/CMakeLists.txt
index f84f1c4..e7d8185 100644
--- a/external/ton/CMakeLists.txt
+++ b/external/ton/CMakeLists.txt
@@ -10,9 +10,11 @@ add_library(desktop-app::external_ton ALIAS external_ton)
 set(ton_loc ${libs_loc}/ton)
 set(ton_build_loc ${ton_loc}/build$<$<CONFIG:Debug>:-debug>)
 if (WIN32)
-    set(ton_libs_mid /$<CONFIG>)
+    set(ton_lib_prefix $<CONFIG>/)
+    set(ton_lib_suffix .lib)
 else()
-    set(ton_libs_mid "")
+    set(ton_lib_prefix lib)
+    set(ton_lib_suffix .a)
 endif()
 
 target_include_directories(external_ton
@@ -27,29 +29,23 @@ INTERFACE
     ${ton_build_loc}/tdutils
 )
 
-if (WIN32)
-    set(ton_lib_suffix .lib)
-else()
-    set(ton_lib_suffix .a)
-endif()
-
 set(ton_libs
-    tonlib${ton_libs_mid}/tonlib
-    tl${ton_libs_mid}/tl_tonlib_api
-    crypto${ton_libs_mid}/smc-envelope
-    lite-client${ton_libs_mid}/lite-client-common
-    crypto${ton_libs_mid}/ton_block
-    adnl${ton_libs_mid}/adnllite
-    tl-utils${ton_libs_mid}/tl-lite-utils
-    keys${ton_libs_mid}/keys
-    tl-utils${ton_libs_mid}/tl-utils
-    tl${ton_libs_mid}/tl_api
-    tl${ton_libs_mid}/tl_lite_api
-    tdnet${ton_libs_mid}/tdnet
-    tdactor${ton_libs_mid}/tdactor
-    crypto${ton_libs_mid}/ton_crypto
-    tdutils${ton_libs_mid}/tdutils
-    third-party/crc32c${ton_libs_mid}/crc32c
+    tonlib/${ton_lib_prefix}tonlib
+    tl/${ton_lib_prefix}tl_tonlib_api
+    crypto/${ton_lib_prefix}smc-envelope
+    lite-client/${ton_lib_prefix}lite-client-common
+    crypto/${ton_lib_prefix}ton_block
+    adnl/${ton_lib_prefix}adnllite
+    tl-utils/${ton_lib_prefix}tl-lite-utils
+    keys/${ton_lib_prefix}keys
+    tl-utils/${ton_lib_prefix}tl-utils
+    tl/${ton_lib_prefix}tl_api
+    tl/${ton_lib_prefix}tl_lite_api
+    tdnet/${ton_lib_prefix}tdnet
+    tdactor/${ton_lib_prefix}tdactor
+    crypto/${ton_lib_prefix}ton_crypto
+    tdutils/${ton_lib_prefix}tdutils
+    third-party/crc32c/${ton_lib_prefix}crc32c
 )
 foreach (lib ${ton_libs})
     list(APPEND ton_libs_list "${ton_build_loc}/${lib}${ton_lib_suffix}")