diff --git a/CMakeLists.txt b/CMakeLists.txt
index 608037101..e2e50022d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.6.0)
 set(PROJECT_NAME lokinet)
 project(${PROJECT_NAME} C CXX ASM)
 
+# Core options
 option(USE_LIBABYSS "enable libabyss" )
 option(USE_AVX2 "enable avx2 code" )
 option(USE_NETNS "enable networking namespace support. Linux only" )
@@ -18,6 +19,9 @@ option(TESTNET "testnet build" )
 option(WITH_SHARED "build shared library")
 option(WITH_COVERAGE "generate coverage data")
 
+# Basic definitions
+get_filename_component(CORE_INCLUDE include ABSOLUTE)
+
 find_program(CCACHE_PROGRAM ccache)
 if(CCACHE_PROGRAM)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
@@ -54,8 +58,8 @@ set(ABSEIL_DIR vendor/abseil-cpp)
 include_directories(${ABSEIL_DIR})
 
 if (NOT WIN32)
-add_compile_options(-fPIC)
-add_subdirectory(${ABSEIL_DIR})
+  add_compile_options(-fPIC)
+  add_subdirectory(${ABSEIL_DIR})
 endif(NOT WIN32)
 
 # turns off those annoying warnings for
@@ -107,17 +111,13 @@ endif(WIN32)
 
 if(DEBIAN)
   add_definitions(-DDEBIAN)
-else()
-  if(NOT ANDROID)
-    if(NOT NON_PC_TARGET)
-      if (NOT USE_AVX2)
-        set(CRYPTO_FLAGS -march=nocona -mtune=native -mfpmath=sse)
-      else()
-        set(CRYPTO_FLAGS -march=haswell -mtune=native -mfpmath=sse)
-      endif(NOT USE_AVX2)
-    endif(NOT NON_PC_TARGET)
-  endif(NOT ANDROID)
-endif(DEBIAN)
+elseif(NOT ANDROID AND NOT NON_PC_TARGET)
+  if (NOT USE_AVX2)
+    set(CRYPTO_FLAGS -march=nocona -mtune=native -mfpmath=sse)
+  else()
+    set(CRYPTO_FLAGS -march=haswell -mtune=native -mfpmath=sse)
+  endif()
+endif()
 
 # only needed if using AVX2
 # TODO: generate a config-time test for this
@@ -223,10 +223,10 @@ endif(JEMALLOC)
 
 # FS_LIB should resolve to nothing on all other platforms
 # it is only required on win32 -rick
-set(LIBS ${LIBS} ${MALLOC_LIB} ${FS_LIB})
+set(LIBS ${MALLOC_LIB} ${FS_LIB})
 
 if(ANDROID)
-  set(LIBS ${LIBS} log)
+  list(APPEND LIBS log)
   add_definitions(-DANDROID)
   set(ANDROID_PLATFORM_SRC llarp/android/ifaddrs.c)
 endif(ANDROID)
@@ -238,40 +238,40 @@ set(CRYPTOGRAPHY_LIB ${LIB}-cryptography)
 set(UTIL_LIB ${LIB}-util)
 set(PLATFORM_LIB ${LIB}-platform)
 set(ANDROID_LIB ${LIB}android)
-set(TT_ROOT vendor/libtuntap-master)
+get_filename_component(TT_ROOT "vendor/libtuntap-master" ABSOLUTE)
 add_definitions(-D${CMAKE_SYSTEM_NAME})
 
 if(UNIX)
   add_definitions(-DUNIX)
   add_definitions(-DPOSIX)
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c)
-        set(EV_SRC llarp/ev/ev_epoll.cpp)
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c)
-        set(EV_SRC llarp/ev/ev_epoll.cpp)
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-openbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev/ev_kqueue.cpp)
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-netbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev/ev_kqueue.cpp)
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev/ev_kqueue.cpp)
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-darwin.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev/ev_kqueue.cpp)
+      get_filename_component(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c ABSOLUTE)
+      get_filename_component(EV_SRC "llarp/ev/ev_epoll.cpp" ABSOLUTE)
+  elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
+  get_filename_component(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c ABSOLUTE)
+      get_filename_component(EV_SRC "llarp/ev/ev_epoll.cpp" ABSOLUTE)
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-openbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
+      get_filename_component(EV_SRC "llarp/ev/ev_kqueue.cpp" ABSOLUTE)
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+      set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-netbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
+      get_filename_component(EV_SRC "llarp/ev/ev_kqueue.cpp" ABSOLUTE)
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+      set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
+      get_filename_component(EV_SRC "llarp/ev/ev_kqueue.cpp" ABSOLUTE)
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+      set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-darwin.c ${TT_ROOT}/tuntap-unix-bsd.c)
+      get_filename_component(EV_SRC "llarp/ev/ev_kqueue.cpp" ABSOLUTE)
 # TODO: _actually_ port to solaris/illumos (it's fairly complete...except for TUN) -rick
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-        set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-sunos.c)
-        set(EV_SRC llarp/ev/ev_epoll.cpp)
-    else()
-        message(FATAL_ERROR "Your operating system is not supported yet")
-    endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+      set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-sunos.c)
+      get_filename_component(EV_SRC "llarp/ev/ev_epoll.cpp" ABSOLUTE)
+  else()
+      message(FATAL_ERROR "Your operating system is not supported yet")
+  endif()
 elseif(WIN32)
-    set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-windows.c)
-    set(EV_SRC llarp/ev/ev_win32.cpp)
+    get_filename_component(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-windows.c ABSOLUTE)
+    get_filename_component(EV_SRC "llarp/ev/ev_win32.cpp" ABSOLUTE)
     add_definitions(-DWIN32_LEAN_AND_MEAN -DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500)
 else()
     message(FATAL_ERROR "What operating system _are_ you building on/for?")
@@ -282,10 +282,8 @@ set(LIBTUNTAP_SRC_BASE
   ${TT_ROOT}/tuntap_log.cpp
   ${LIBTUNTAP_IMPL})
 
-if (UNIX)
-  set(LIBTUNTAP_SRC
-      ${TT_ROOT}/tuntap-unix.c
-      ${LIBTUNTAP_SRC_BASE})
+if(UNIX)
+  set(LIBTUNTAP_SRC ${TT_ROOT}/tuntap-unix.c ${LIBTUNTAP_SRC_BASE})
 else()
   set(LIBTUNTAP_SRC ${LIBTUNTAP_SRC_BASE})
 endif(UNIX)
@@ -295,332 +293,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if(NOT WIN32)
-set(CXX_COMPAT_SRC
-  vendor/cppbackport-master/lib/fs/rename.cpp
-  vendor/cppbackport-master/lib/fs/filestatus.cpp
-  vendor/cppbackport-master/lib/fs/filetype.cpp
-  vendor/cppbackport-master/lib/fs/cleanpath.cpp
-  vendor/cppbackport-master/lib/fs/perms.cpp
-  vendor/cppbackport-master/lib/fs/equivalent.cpp
-  vendor/cppbackport-master/lib/fs/current_path.cpp
-  vendor/cppbackport-master/lib/fs/basename.cpp
-  vendor/cppbackport-master/lib/fs/tempdir.cpp
-  vendor/cppbackport-master/lib/fs/create_directory.cpp
-  vendor/cppbackport-master/lib/fs/path.cpp
-  vendor/cppbackport-master/lib/fs/remove.cpp
-  vendor/cppbackport-master/lib/fs/diriter.cpp
-  vendor/cppbackport-master/lib/fs/copyfile.cpp
-  vendor/cppbackport-master/lib/fs/absolute.cpp
-  vendor/cppbackport-master/lib/fs/direntry.cpp
-)
-include_directories(vendor/cppbackport-master/lib)
+  add_subdirectory(vendor)
 endif(NOT WIN32)
 
-set(LIB_UTIL_SRC
-  llarp/constants/defaults.cpp
-  llarp/constants/link_layer.cpp
-  llarp/constants/proto.cpp
-  llarp/constants/version.cpp
-  llarp/util/aligned.cpp
-  llarp/util/bencode.cpp
-  llarp/util/bits.cpp
-  llarp/util/buffer.cpp
-  llarp/util/codel.cpp
-  llarp/util/common.cpp
-  llarp/util/encode.cpp
-  llarp/util/endian.cpp
-  llarp/util/fs.cpp
-  llarp/util/ini.cpp
-  llarp/util/logger.c
-  llarp/util/logger.cpp
-  llarp/util/logic.cpp
-  llarp/util/mem.cpp
-  llarp/util/queue_manager.cpp
-  llarp/util/queue.cpp
-  llarp/util/str.cpp
-  llarp/util/string_view.cpp
-  llarp/util/thread_pool.cpp
-  llarp/util/threading.cpp
-  llarp/util/threadpool.cpp
-  llarp/util/time.cpp
-  llarp/util/timer.cpp
-  llarp/util/types.cpp
-)
-
-set(LIB_PLATFORM_SRC
-# for networking
-  llarp/ev/ev.cpp
-  llarp/net/net.cpp
-  llarp/net/net_addr.cpp
-  llarp/net/net_inaddr.cpp
-# for android shim
-  ${ANDROID_PLATFORM_SRC}
-# process isolation implementation
-  ${ISOLATE_PROC_SRC}
-# tun
-  ${LIBTUNTAP_SRC}
-  ${EV_SRC}
-# c++17 compat code
-  ${CXX_COMPAT_SRC}
-# win32 inline code
-  llarp/win32/win32_inet.c
-  llarp/win32/win32_intrnl.c
-  llarp/win32/win32_upoll.c
-)
-
-set(NTRU_AVX_SRC
-  crypto/libntrup/src/avx/randomsmall.c
-  crypto/libntrup/src/avx/weight.c
-  crypto/libntrup/src/avx/swap.c
-  crypto/libntrup/src/avx/rq_round3.c
-  crypto/libntrup/src/avx/rq_recip3.c
-  crypto/libntrup/src/avx/small.c
-  crypto/libntrup/src/avx/randomweightw.c
-  crypto/libntrup/src/avx/dec.c
-  crypto/libntrup/src/avx/r3_recip.c
-  crypto/libntrup/src/avx/keypair.c
-  crypto/libntrup/src/avx/rq_rounded.c
-  crypto/libntrup/src/avx/mult.c
-  crypto/libntrup/src/avx/enc.c
-  crypto/libntrup/src/avx/int32_sort.c
-  crypto/libntrup/src/avx/rq.c
-  crypto/libntrup/src/avx/rq_mod3.c
-)
-
-set(NTRU_REF_SRC
-  crypto/libntrup/src/ref/randomsmall.c
-  crypto/libntrup/src/ref/swap.c
-  crypto/libntrup/src/ref/rq_round3.c
-  crypto/libntrup/src/ref/rq_recip3.c
-  crypto/libntrup/src/ref/small.c
-  crypto/libntrup/src/ref/rq_mult.c
-  crypto/libntrup/src/ref/randomweightw.c
-  crypto/libntrup/src/ref/random32.c
-  crypto/libntrup/src/ref/dec.c
-  crypto/libntrup/src/ref/r3_mult.c
-  crypto/libntrup/src/ref/r3_recip.c
-  crypto/libntrup/src/ref/keypair.c
-  crypto/libntrup/src/ref/rq_rounded.c
-  crypto/libntrup/src/ref/enc.c
-  crypto/libntrup/src/ref/int32_sort.c
-  crypto/libntrup/src/ref/rq.c
-)
-
-include_directories(crypto/include)
-
-set(NTRU_SRC
-  ${NTRU_AVX_SRC}
-  ${NTRU_REF_SRC}
-  crypto/libntrup/src/ntru.cpp
-  )
-
-set(SHA512_SRC
-  crypto/sha512/sha512.c)
-
-set(CHACHA_SRC
-  crypto/chacha20/ref/chacha20_ref.c
-  crypto/chacha20/dolbeau/chacha20_dolbeau-ssse3.c
-  crypto/chacha20/dolbeau/chacha20_dolbeau-avx2.c
-  crypto/chacha20/stream_chacha20.c
-  crypto/salsa20/ref/salsa20_ref.c
-  crypto/salsa20/core_salsa_ref.c
-  crypto/salsa20/stream_salsa20.c
-  crypto/salsa20/xmm6/salsa20_xmm6-asm.S
-  crypto/salsa20/xmm6/salsa20_xmm6.c
-  crypto/salsa20/xmm6int/salsa20_xmm6int-avx2.c
-  crypto/salsa20/xmm6int/salsa20_xmm6int-sse2.c
-  crypto/xchacha20/hchacha.c
-  crypto/xchacha20/stream_xchacha20.c)
-
-set(CSRNG_SRC
-  crypto/csrng/randombytes_salsa20_random.c
-  crypto/csrng/randombytes.c)
-
-set(CRYPTO_MEM_SRC
-  crypto/secmem/secmem.c)
-
-set(BLAKE2B_SRC
-    crypto/blake2b/blake2b-compress-avx2.c
-    crypto/blake2b/blake2b-compress-ref.c
-    crypto/blake2b/blake2b-compress-sse41.c
-    crypto/blake2b/blake2b-compress-ssse3.c
-    crypto/blake2b/blake2b-ref.c
-    crypto/blake2b/generichash_blake2b.c)
-
-set(X25519_SRC
-  crypto/curve25519/crypto_scalarmult.c
-  crypto/curve25519/ref10/x25519_ref10.c
-  crypto/curve25519/ref10/ed25519_ref10.c
-  crypto/curve25519/sandy2x/fe51_invert.c
-  crypto/curve25519/sandy2x/ladder_base.S
-  crypto/curve25519/sandy2x/curve25519_sandy2x.c
-  crypto/curve25519/sandy2x/consts.S
-  crypto/curve25519/sandy2x/fe51_nsquare.S
-  crypto/curve25519/sandy2x/fe51_mul.S
-  crypto/curve25519/sandy2x/fe51_pack.S
-  crypto/curve25519/sandy2x/fe_frombytes_sandy2x.c
-  crypto/curve25519/sandy2x/sandy2x.S
-  crypto/curve25519/sandy2x/ladder.S
-  crypto/curve25519/scalarmult_curve25519.c
-  crypto/ed25519/crypto_box.c
-  crypto/ed25519/crypto_sign.c
-  crypto/ed25519/ref10/open.c
-  crypto/ed25519/ref10/obsolete.c
-  crypto/ed25519/ref10/keypair.c
-  crypto/ed25519/ref10/sign.c
-  crypto/ed25519/sign_ed25519.c)
-
-set(CRYPTOGRAPHY_SRC
-  crypto/libsodium/init.c
-  crypto/libsodium/runtime.c
-  crypto/verify/crypto_verify.c
-  ${CRYPTO_MEM_SRC}
-  ${CSRNG_SRC}
-  ${BLAKE2B_SRC}
-  ${CHACHA_SRC}
-  ${ED25519_SRC}
-  ${X25519_SRC}
-  ${SHA512_SRC}
-  ${NTRU_SRC})
-
-add_library(${CRYPTOGRAPHY_LIB} STATIC ${CRYPTOGRAPHY_SRC})
-
-set(UTP_SRC
-  libutp/utp_callbacks.cpp
-  libutp/utp_utils.cpp
-  libutp/utp_internal.cpp
-  libutp/utp_api.cpp
-  libutp/utp_packedsockaddr.cpp
-  libutp/utp_hash.cpp
-)
-
-if(WIN32)
-  set(UTP_SRC ${UTP_SRC} libutp/libutp_inet_ntop.cpp)
-endif(WIN32)
-
-set(DNSLIB_SRC
-  llarp/dns/dotlokilookup.cpp
-  llarp/dns/dns.cpp
-  llarp/dns/iptracker.cpp
-  llarp/dns/message.cpp
-  llarp/dns/name.cpp
-  llarp/dns/query.cpp
-  llarp/dns/question.cpp
-  llarp/dns/rectypes.cpp
-  llarp/dns/rr.cpp
-  llarp/dns/serialize.cpp
-  llarp/dns/server.cpp
-  llarp/dns/string.cpp
-)
-
-
-set(LIB_SRC
-  ${DNSLIB_SRC}
-  ${UTP_SRC}
-  llarp/config.cpp
-  llarp/context.cpp
-  llarp/crypto/constants.cpp
-  llarp/crypto/crypto_libsodium.cpp
-  llarp/crypto/crypto.cpp
-  llarp/crypto/encrypted_frame.cpp
-  llarp/crypto/encrypted.cpp
-  llarp/crypto/types.cpp
-  llarp/dht/bucket.cpp
-  llarp/dht/context.cpp
-  llarp/dht/dht.cpp
-  llarp/dht/explorenetworkjob.cpp
-  llarp/dht/kademlia.cpp
-  llarp/dht/key.cpp
-  llarp/dht/localtaglookup.cpp
-  llarp/dht/localrouterlookup.cpp
-  llarp/dht/localserviceaddresslookup.cpp
-  llarp/dht/message.cpp
-  llarp/dht/messages/findintro.cpp
-  llarp/dht/messages/findrouter.cpp
-  llarp/dht/messages/gotintro.cpp
-  llarp/dht/messages/gotrouter.cpp
-  llarp/dht/messages/pubintro.cpp
-  llarp/dht/node.cpp
-  llarp/dht/publishservicejob.cpp
-  llarp/dht/recursiverouterlookup.cpp
-  llarp/dht/serviceaddresslookup.cpp
-  llarp/dht/taglookup.cpp
-  llarp/dht/tx.cpp
-  llarp/dht/txholder.cpp
-  llarp/dht/txowner.cpp
-  llarp/dns.cpp
-  llarp/dnsc.cpp
-  llarp/dnsd.cpp
-  llarp/exit/close_exit.cpp
-  llarp/exit/context.cpp
-  llarp/exit/endpoint.cpp
-  llarp/exit/grant_exit.cpp
-  llarp/exit/obtain_exit.cpp
-  llarp/exit/policy.cpp
-  llarp/exit/reject_exit.cpp
-  llarp/exit/session.cpp
-  llarp/exit/transfer_traffic.cpp
-  llarp/exit/update_exit.cpp
-  llarp/handlers/exit.cpp
-  llarp/handlers/null.cpp
-  llarp/handlers/tun.cpp
-  llarp/link/curvecp.cpp
-  llarp/link/encoder.cpp
-  llarp/link/iwp.cpp
-  llarp/link/server.cpp
-  llarp/link/session.cpp
-  llarp/link/utp.cpp
-  llarp/messages/dht.cpp
-  llarp/messages/dht_immediate.cpp
-  llarp/messages/discard.cpp
-  llarp/messages/exit.cpp
-  llarp/messages/link_intro.cpp
-  llarp/messages/link_message.cpp
-  llarp/messages/path_confirm.cpp
-  llarp/messages/path_latency.cpp
-  llarp/messages/path_transfer.cpp
-  llarp/messages/relay.cpp
-  llarp/messages/relay_commit.cpp
-  llarp/messages/transfer_traffic.cpp
-  llarp/net/address_info.cpp
-  llarp/net/exit_info.cpp
-  llarp/net/ip.cpp
-  llarp/net/net_int.cpp
-  llarp/nodedb.cpp
-  llarp/path/path.cpp
-  llarp/path/path_types.cpp
-  llarp/path/pathbuilder.cpp
-  llarp/path/pathset.cpp
-  llarp/path/transit_hop.cpp
-  llarp/pow.cpp
-  llarp/profiling.cpp
-  llarp/router/router.cpp
-  llarp/router_contact.cpp
-  llarp/router_id.cpp
-  llarp/routing/dht_message.cpp
-  llarp/routing/handler.cpp
-  llarp/routing/message_parser.cpp
-  llarp/routing/message.cpp
-  llarp/routing/path_confirm.cpp
-  llarp/routing/path_latency.cpp
-  llarp/routing/path_transfer.cpp
-  llarp/rpc/rpc.cpp
-  llarp/service/Identity.cpp
-  llarp/service/Intro.cpp
-  llarp/service/IntroSet.cpp
-  llarp/service/address.cpp
-  llarp/service/config.cpp
-  llarp/service/context.cpp
-  llarp/service/endpoint.cpp
-  llarp/service/handler.cpp
-  llarp/service/info.cpp
-  llarp/service/lookup.cpp
-  llarp/service/protocol.cpp
-  llarp/service/tag.cpp
-  llarp/service/types.cpp
-  llarp/service/vanity.cpp
-  llarp/testnet.c
-)
+add_subdirectory(crypto)
+add_subdirectory(libutp)
+add_subdirectory(llarp)
 
 set(RC_SRC
   daemon/rcutil.cpp
@@ -637,116 +315,23 @@ set(DNS_SRC
   daemon/dns.cpp
 )
 
-set(TEST_SRC
-  # helpers
-  test/main.cpp
-  test/crypto/mock_crypto.cpp
-  test/dht/mock_context.cpp
-  test/test_util.cpp
-  # actual test cases
-  test/crypto/test_llarp_crypto_types.cpp
-  test/crypto/test_llarp_crypto.cpp
-  test/dht/test_llarp_dht_bucket.cpp
-  test/dht/test_llarp_dht_explorenetworkjob.cpp
-  test/dht/test_llarp_dht_kademlia.cpp
-  test/dht/test_llarp_dht_key.cpp
-  test/dht/test_llarp_dht_node.cpp
-  test/dht/test_llarp_dht_serviceaddresslookup.cpp
-  test/dht/test_llarp_dht_taglookup.cpp
-  test/dht/test_llarp_dht_tx.cpp
-  test/dht/test_llarp_dht_txowner.cpp
-  test/dns/test_llarp_dns_dns.cpp
-  test/exit/test_llarp_exit_context.cpp
-  test/link/test_llarp_link.cpp
-  test/net/test_llarp_net_inaddr.cpp
-  test/net/test_llarp_net.cpp
-  test/routing/llarp_routing_transfer_traffic.cpp
-  test/routing/test_llarp_routing_obtainexitmessage.cpp
-  test/service/test_llarp_service_address.cpp
-  test/service/test_llarp_service_identity.cpp
-  test/test_llarp_dns.cpp
-  test/test_llarp_dnsd.cpp
-  test/test_llarp_encrypted_frame.cpp
-  test/test_llarp_router_contact.cpp
-  test/test_llarp_router.cpp
-  test/util/test_llarp_util_aligned.cpp
-  test/util/test_llarp_util_bencode.cpp
-  test/util/test_llarp_util_bits.cpp
-  test/util/test_llarp_util_encode.cpp
-  test/util/test_llarp_util_ini.cpp
-  test/util/test_llarp_util_queue_manager.cpp
-  test/util/test_llarp_util_queue.cpp
-  test/util/test_llarp_util_thread_pool.cpp
-)
-
-set(TEST_EXE testAll)
-set(GTEST_DIR test/gtest)
-set(CLIENT_EXE llarpc)
-
-set(CLIENT_SRC
-  client/main.cpp
-)
-
-include_directories(include)
-# TODO: exclude this from includes and expose stuff properly for rcutil
-include_directories(llarp)
-#include_directories(include)
-#include_directories(vendor/cppbackport-master/lib)
-#include_directories(${sodium_INCLUDE_DIR})
-
-set(RC_EXE rcutil)
-set(DNS_EXE dns)
-set(ALL_SRC ${CLIENT_SRC} ${RC_SRC} ${EXE_SRC} ${DNS_SRC} ${LIB_PLATFORM_SRC} ${LIB_SRC} ${TEST_SRC})
-
-if(USE_LIBABYSS)
-  add_definitions(-DUSE_ABYSS=1)
-  set(ABYSS libabyss)
-  set(ABYSS_LIB abyss)
-  set(ABYSS_EXE ${ABYSS_LIB}-main)
-  include_directories(${ABYSS}/include)
-  set(ABYSS_SRC
-    ${ABYSS}/src/http.cpp
-    ${ABYSS}/src/client.cpp
-    ${ABYSS}/src/server.cpp
-    ${ABYSS}/src/json.cpp)
-  add_library(${ABYSS_LIB} STATIC ${ABYSS_SRC})
-  set(ALL_SRC ${ALL_SRC} ${ABYSS_SRC} ${ABYSS}/main.cpp)
-  if (NOT WIN32)
-    add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp)
-    target_link_libraries(${ABYSS_EXE} ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB} Threads::Threads)
-  else()
-    add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp llarp/win32/abyss.rc)
-    target_link_libraries(${ABYSS_EXE} ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi Threads::Threads)
-  endif(NOT WIN32)
-
-  set(TEST_SRC ${TEST_SRC} test/test_libabyss.cpp)
-  # for freebsd
-  if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    include_directories(/usr/local/include)
-  endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-endif(USE_LIBABYSS)
+set(ALL_SRC ${RC_SRC} ${EXE_SRC} ${DNS_SRC} ${LIB_PLATFORM_SRC} ${LIB_SRC})
 
 foreach(F ${ALL_SRC})
-set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
+  set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
 endforeach(F)
 
 if(SHADOW)
-  add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC} ${LIB_PLATFORM_SRC} ${CPP_BACKPORT_SRC} ${ABYSS_SRC} ${CRYPTOGRAPHY_SRC})
+  add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC} ${UTP_SRC} ${LIB_PLATFORM_SRC} ${CPP_BACKPORT_SRC} ${ABYSS_SRC} ${CRYPTOGRAPHY_SRC})
   target_link_libraries(shadow-plugin-${SHARED_LIB} ${LIBS})
   install(TARGETS shadow-plugin-${SHARED_LIB} DESTINATION plugins)
 else()
-  add_subdirectory(${GTEST_DIR})
   if(NOT WIN32)
-    add_executable(${TEST_EXE} ${TEST_SRC})
     add_executable(${EXE} ${EXE_SRC})
   else()
-    add_executable(${TEST_EXE} ${TEST_SRC} llarp/win32/test.rc)
     add_executable(${EXE} ${EXE_SRC} llarp/win32/version.rc)
   endif(NOT WIN32)
 
-  target_include_directories(${TEST_EXE} PRIVATE test)
-  target_include_directories(${TEST_EXE} PRIVATE ${GTEST_DIR}/include ${GTEST_DIR})
-
   install(TARGETS ${EXE} RUNTIME DESTINATION bin)
   if(WIN32)
     install(PROGRAMS ${CMAKE_SOURCE_DIR}/lokinet-bootstrap.exe DESTINATION bin)
@@ -758,24 +343,6 @@ else()
     install(CODE "execute_process(COMMAND setcap cap_net_admin,cap_net_bind_service=+eip ${CMAKE_INSTALL_PREFIX}/bin/lokinet)")
   endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-  add_library(${STATIC_LIB} STATIC ${LIB_SRC})
-  add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
-
-# cut back on fluff
-if (NOT WIN32)
-  target_link_libraries(${UTIL_LIB} absl::optional)
-else()
-  target_link_libraries(${UTIL_LIB})
-endif(NOT WIN32)
-
-  add_library(${PLATFORM_LIB} STATIC ${LIB_PLATFORM_SRC})
-
-  if(USE_LIBABYSS)
-    target_link_libraries(${PLATFORM_LIB} ${UTIL_LIB} Threads::Threads ${ABYSS_LIB})
-  else()
-    target_link_libraries(${PLATFORM_LIB} ${UTIL_LIB} Threads::Threads)
-  endif(USE_LIBABYSS)
-
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     if(NON_PC_TARGET)
       target_link_libraries(${PLATFORM_LIB} -lrt)
@@ -784,13 +351,10 @@ endif(NOT WIN32)
     endif(NON_PC_TARGET)
   endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-  target_link_libraries(${STATIC_LIB} ${CRYPTOGRAPHY_LIB} ${LIBS} ${UTIL_LIB} ${PLATFORM_LIB})
   if (WIN32)
-    target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
-    target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gmock gtest ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
+    target_link_libraries(${EXE} ${STATIC_LIB} ws2_32 iphlpapi)
   else()
-    target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB})
-    target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gmock gtest absl::variant ${STATIC_LIB} ${UTIL_LIB} ${PLATFORM_LIB})
+    target_link_libraries(${EXE} ${STATIC_LIB} cppbackport libutp)
   endif(WIN32)
 
 
@@ -804,8 +368,45 @@ endif(NOT WIN32)
     if (WIN32)
       target_link_libraries(${SHARED_LIB} ${CRYPTOGRAPHY_LIB} ${LIBS} ${UTIL_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi Threads::Threads)
     else (NOT WIN32)
-      target_link_libraries(${SHARED_LIB} ${CRYPTOGRAPHY_LIB} ${LIBS} ${UTIL_LIB} ${PLATFORM_LIB} Threads::Threads)
+      target_link_libraries(${SHARED_LIB} ${CRYPTOGRAPHY_LIB} ${LIBS} ${UTIL_LIB} libutp ${PLATFORM_LIB} Threads::Threads)
       install(TARGETS ${SHARED_LIB} LIBRARY DESTINATION lib)
     endif(WIN32)
   endif(WITH_SHARED)
 endif(SHADOW)
+
+if(USE_LIBABYSS)
+  add_definitions(-DUSE_ABYSS=1)
+  set(ABYSS libabyss)
+  set(ABYSS_LIB abyss)
+  set(ABYSS_EXE ${ABYSS_LIB}-main)
+  set(ABYSS_SRC
+    ${ABYSS}/src/http.cpp
+    ${ABYSS}/src/client.cpp
+    ${ABYSS}/src/server.cpp
+    ${ABYSS}/src/json.cpp)
+  add_library(${ABYSS_LIB} OBJECT ${ABYSS_SRC})
+  target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB})
+  list(APPEND ALL_SRC ${ABYSS_SRC} ${ABYSS}/main.cpp)
+
+  if (NOT WIN32)
+    add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp)
+  else()
+    add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp llarp/win32/abyss.rc)
+    target_link_libraries(${ABYSS_EXE} ws2_32 iphlpapi)
+  endif(NOT WIN32)
+
+  target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} Threads::Threads)
+  target_include_directories(${ABYSS_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
+  target_include_directories(${ABYSS_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
+
+  # for freebsd
+  if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    target_include_directories(${ABYSS_LIB} /usr/local/include)
+  endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif(USE_LIBABYSS)
+
+enable_testing()
+
+if (NOT SHADOW)
+  add_subdirectory(test)
+endif()
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
new file mode 100644
index 000000000..ce36e2651
--- /dev/null
+++ b/crypto/CMakeLists.txt
@@ -0,0 +1,115 @@
+set(NTRU_AVX_SRC
+  libntrup/src/avx/randomsmall.c
+  libntrup/src/avx/weight.c
+  libntrup/src/avx/swap.c
+  libntrup/src/avx/rq_round3.c
+  libntrup/src/avx/rq_recip3.c
+  libntrup/src/avx/small.c
+  libntrup/src/avx/randomweightw.c
+  libntrup/src/avx/dec.c
+  libntrup/src/avx/r3_recip.c
+  libntrup/src/avx/keypair.c
+  libntrup/src/avx/rq_rounded.c
+  libntrup/src/avx/mult.c
+  libntrup/src/avx/enc.c
+  libntrup/src/avx/int32_sort.c
+  libntrup/src/avx/rq.c
+  libntrup/src/avx/rq_mod3.c
+)
+
+set(NTRU_REF_SRC
+  libntrup/src/ref/randomsmall.c
+  libntrup/src/ref/swap.c
+  libntrup/src/ref/rq_round3.c
+  libntrup/src/ref/rq_recip3.c
+  libntrup/src/ref/small.c
+  libntrup/src/ref/rq_mult.c
+  libntrup/src/ref/randomweightw.c
+  libntrup/src/ref/random32.c
+  libntrup/src/ref/dec.c
+  libntrup/src/ref/r3_mult.c
+  libntrup/src/ref/r3_recip.c
+  libntrup/src/ref/keypair.c
+  libntrup/src/ref/rq_rounded.c
+  libntrup/src/ref/enc.c
+  libntrup/src/ref/int32_sort.c
+  libntrup/src/ref/rq.c
+)
+
+set(NTRU_SRC
+  ${NTRU_AVX_SRC}
+  ${NTRU_REF_SRC}
+  libntrup/src/ntru.cpp
+  )
+
+set(SHA512_SRC
+  sha512/sha512.c)
+
+set(CHACHA_SRC
+  chacha20/ref/chacha20_ref.c
+  chacha20/dolbeau/chacha20_dolbeau-ssse3.c
+  chacha20/dolbeau/chacha20_dolbeau-avx2.c
+  chacha20/stream_chacha20.c
+  salsa20/ref/salsa20_ref.c
+  salsa20/core_salsa_ref.c
+  salsa20/stream_salsa20.c
+  salsa20/xmm6/salsa20_xmm6-asm.S
+  salsa20/xmm6/salsa20_xmm6.c
+  salsa20/xmm6int/salsa20_xmm6int-avx2.c
+  salsa20/xmm6int/salsa20_xmm6int-sse2.c
+  xchacha20/hchacha.c
+  xchacha20/stream_xchacha20.c)
+
+set(CSRNG_SRC
+  csrng/randombytes_salsa20_random.c
+  csrng/randombytes.c)
+
+set(CRYPTO_MEM_SRC
+  secmem/secmem.c)
+
+set(BLAKE2B_SRC
+    blake2b/blake2b-compress-avx2.c
+    blake2b/blake2b-compress-ref.c
+    blake2b/blake2b-compress-sse41.c
+    blake2b/blake2b-compress-ssse3.c
+    blake2b/blake2b-ref.c
+    blake2b/generichash_blake2b.c)
+
+set(X25519_SRC
+  curve25519/crypto_scalarmult.c
+  curve25519/ref10/x25519_ref10.c
+  curve25519/ref10/ed25519_ref10.c
+  curve25519/sandy2x/fe51_invert.c
+  curve25519/sandy2x/ladder_base.S
+  curve25519/sandy2x/curve25519_sandy2x.c
+  curve25519/sandy2x/consts.S
+  curve25519/sandy2x/fe51_nsquare.S
+  curve25519/sandy2x/fe51_mul.S
+  curve25519/sandy2x/fe51_pack.S
+  curve25519/sandy2x/fe_frombytes_sandy2x.c
+  curve25519/sandy2x/sandy2x.S
+  curve25519/sandy2x/ladder.S
+  curve25519/scalarmult_curve25519.c
+  ed25519/crypto_box.c
+  ed25519/crypto_sign.c
+  ed25519/ref10/open.c
+  ed25519/ref10/obsolete.c
+  ed25519/ref10/keypair.c
+  ed25519/ref10/sign.c
+  ed25519/sign_ed25519.c)
+
+set(CRYPTOGRAPHY_SRC
+  libsodium/init.c
+  libsodium/runtime.c
+  verify/crypto_verify.c
+  ${CRYPTO_MEM_SRC}
+  ${CSRNG_SRC}
+  ${BLAKE2B_SRC}
+  ${CHACHA_SRC}
+  ${ED25519_SRC}
+  ${X25519_SRC}
+  ${SHA512_SRC}
+  ${NTRU_SRC})
+
+add_library(${CRYPTOGRAPHY_LIB} STATIC ${CRYPTOGRAPHY_SRC})
+target_include_directories (${CRYPTOGRAPHY_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
diff --git a/libutp/CMakeLists.txt b/libutp/CMakeLists.txt
new file mode 100644
index 000000000..29a10c615
--- /dev/null
+++ b/libutp/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(UTP_SRC
+  utp_callbacks.cpp
+  utp_utils.cpp
+  utp_internal.cpp
+  utp_api.cpp
+  utp_packedsockaddr.cpp
+  utp_hash.cpp
+)
+
+if(WIN32)
+  list(APPEND UTP_SRC libutp_inet_ntop.cpp)
+endif(WIN32)
+
+add_library(libutp OBJECT ${UTP_SRC})
+target_include_directories(libutp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CORE_INCLUDE})
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
new file mode 100644
index 000000000..23c60d6b4
--- /dev/null
+++ b/llarp/CMakeLists.txt
@@ -0,0 +1,190 @@
+set(LIB_UTIL_SRC
+  constants/defaults.cpp
+  constants/link_layer.cpp
+  constants/proto.cpp
+  constants/version.cpp
+  util/aligned.cpp
+  util/bencode.cpp
+  util/bits.cpp
+  util/buffer.cpp
+  util/codel.cpp
+  util/common.cpp
+  util/encode.cpp
+  util/endian.cpp
+  util/fs.cpp
+  util/ini.cpp
+  util/logger.c
+  util/logger.cpp
+  util/logic.cpp
+  util/mem.cpp
+  util/queue_manager.cpp
+  util/queue.cpp
+  util/str.cpp
+  util/string_view.cpp
+  util/thread_pool.cpp
+  util/threading.cpp
+  util/threadpool.cpp
+  util/time.cpp
+  util/timer.cpp
+  util/types.cpp
+)
+
+add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
+target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(${UTIL_LIB} cppbackport)
+
+# cut back on fluff
+if (NOT WIN32)
+    target_link_libraries(${UTIL_LIB} absl::optional)
+endif(NOT WIN32)
+
+set(LIB_PLATFORM_SRC
+# for networking
+  ev/ev.cpp
+  net/net.cpp
+  net/net_addr.cpp
+  net/net_inaddr.cpp
+# for android shim
+  ${ANDROID_PLATFORM_SRC}
+# process isolation implementation
+  ${ISOLATE_PROC_SRC}
+# tun
+  ${LIBTUNTAP_SRC}
+  ${EV_SRC}
+# win32 inline code
+  win32/win32_inet.c
+  win32/win32_intrnl.c
+  win32/win32_upoll.c
+)
+
+add_library(${PLATFORM_LIB} STATIC ${LIB_PLATFORM_SRC})
+target_link_libraries(${PLATFORM_LIB} PUBLIC ${CRYPTOGRAPHY_LIB} ${UTIL_LIB} libutp cppbackport Threads::Threads)
+
+if(USE_LIBABYSS)
+    target_link_libraries(${PLATFORM_LIB} ${ABYSS_LIB})
+endif()
+
+set(DNSLIB_SRC
+  dns/dotlokilookup.cpp
+  dns/dns.cpp
+  dns/iptracker.cpp
+  dns/message.cpp
+  dns/name.cpp
+  dns/query.cpp
+  dns/question.cpp
+  dns/rectypes.cpp
+  dns/rr.cpp
+  dns/serialize.cpp
+  dns/server.cpp
+  dns/string.cpp
+)
+
+set(LIB_SRC
+  ${DNSLIB_SRC}
+  config.cpp
+  context.cpp
+  crypto/constants.cpp
+  crypto/crypto_libsodium.cpp
+  crypto/crypto.cpp
+  crypto/encrypted_frame.cpp
+  crypto/encrypted.cpp
+  crypto/types.cpp
+  dht/bucket.cpp
+  dht/context.cpp
+  dht/dht.cpp
+  dht/explorenetworkjob.cpp
+  dht/kademlia.cpp
+  dht/key.cpp
+  dht/localtaglookup.cpp
+  dht/localrouterlookup.cpp
+  dht/localserviceaddresslookup.cpp
+  dht/message.cpp
+  dht/messages/findintro.cpp
+  dht/messages/findrouter.cpp
+  dht/messages/gotintro.cpp
+  dht/messages/gotrouter.cpp
+  dht/messages/pubintro.cpp
+  dht/node.cpp
+  dht/publishservicejob.cpp
+  dht/recursiverouterlookup.cpp
+  dht/serviceaddresslookup.cpp
+  dht/taglookup.cpp
+  dht/tx.cpp
+  dht/txholder.cpp
+  dht/txowner.cpp
+  dns.cpp
+  dnsc.cpp
+  dnsd.cpp
+  exit/close_exit.cpp
+  exit/context.cpp
+  exit/endpoint.cpp
+  exit/grant_exit.cpp
+  exit/obtain_exit.cpp
+  exit/policy.cpp
+  exit/reject_exit.cpp
+  exit/session.cpp
+  exit/transfer_traffic.cpp
+  exit/update_exit.cpp
+  handlers/exit.cpp
+  handlers/null.cpp
+  handlers/tun.cpp
+  link/curvecp.cpp
+  link/encoder.cpp
+  link/iwp.cpp
+  link/server.cpp
+  link/session.cpp
+  link/utp.cpp
+  messages/dht.cpp
+  messages/dht_immediate.cpp
+  messages/discard.cpp
+  messages/exit.cpp
+  messages/link_intro.cpp
+  messages/link_message.cpp
+  messages/path_confirm.cpp
+  messages/path_latency.cpp
+  messages/path_transfer.cpp
+  messages/relay.cpp
+  messages/relay_commit.cpp
+  messages/transfer_traffic.cpp
+  net/address_info.cpp
+  net/exit_info.cpp
+  net/ip.cpp
+  net/net_int.cpp
+  nodedb.cpp
+  path/path.cpp
+  path/path_types.cpp
+  path/pathbuilder.cpp
+  path/pathset.cpp
+  path/transit_hop.cpp
+  pow.cpp
+  profiling.cpp
+  router/router.cpp
+  router_contact.cpp
+  router_id.cpp
+  routing/dht_message.cpp
+  routing/handler.cpp
+  routing/message_parser.cpp
+  routing/message.cpp
+  routing/path_confirm.cpp
+  routing/path_latency.cpp
+  routing/path_transfer.cpp
+  rpc/rpc.cpp
+  service/Identity.cpp
+  service/Intro.cpp
+  service/IntroSet.cpp
+  service/address.cpp
+  service/config.cpp
+  service/context.cpp
+  service/endpoint.cpp
+  service/handler.cpp
+  service/info.cpp
+  service/lookup.cpp
+  service/protocol.cpp
+  service/tag.cpp
+  service/types.cpp
+  service/vanity.cpp
+  testnet.c
+)
+
+add_library(${STATIC_LIB} STATIC ${LIB_SRC})
+target_link_libraries(${STATIC_LIB} PUBLIC ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB} cppbackport libutp ${LIBS})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 000000000..059e9342d
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,102 @@
+set(TEST_EXE testAll)
+set(GTEST_DIR gtest)
+add_subdirectory(${GTEST_DIR})
+
+set(TEST_SRC
+  # helpers
+  main.cpp
+  crypto/mock_crypto.cpp
+  dht/mock_context.cpp
+  test_util.cpp
+  # actual test cases
+  crypto/test_llarp_crypto_types.cpp
+  crypto/test_llarp_crypto.cpp
+  dht/test_llarp_dht_bucket.cpp
+  dht/test_llarp_dht_explorenetworkjob.cpp
+  dht/test_llarp_dht_kademlia.cpp
+  dht/test_llarp_dht_key.cpp
+  dht/test_llarp_dht_node.cpp
+  dht/test_llarp_dht_serviceaddresslookup.cpp
+  dht/test_llarp_dht_taglookup.cpp
+  dht/test_llarp_dht_tx.cpp
+  dht/test_llarp_dht_txowner.cpp
+  dns/test_llarp_dns_dns.cpp
+  exit/test_llarp_exit_context.cpp
+  link/test_llarp_link.cpp
+  net/test_llarp_net_inaddr.cpp
+  net/test_llarp_net.cpp
+  routing/llarp_routing_transfer_traffic.cpp
+  routing/test_llarp_routing_obtainexitmessage.cpp
+  service/test_llarp_service_address.cpp
+  service/test_llarp_service_identity.cpp
+  test_llarp_dns.cpp
+  test_llarp_dnsd.cpp
+  test_llarp_encrypted_frame.cpp
+  test_llarp_router_contact.cpp
+  test_llarp_router.cpp
+  util/test_llarp_util_aligned.cpp
+  util/test_llarp_util_bencode.cpp
+  util/test_llarp_util_bits.cpp
+  util/test_llarp_util_encode.cpp
+  util/test_llarp_util_ini.cpp
+  util/test_llarp_util_queue_manager.cpp
+  util/test_llarp_util_queue.cpp
+  util/test_llarp_util_thread_pool.cpp
+)
+
+add_executable(${TEST_EXE}
+    # helpers
+    main.cpp
+    crypto/mock_crypto.cpp
+    dht/mock_context.cpp
+    test_util.cpp
+    # actual test cases
+    crypto/test_llarp_crypto_types.cpp
+    crypto/test_llarp_crypto.cpp
+    dht/test_llarp_dht_bucket.cpp
+    dht/test_llarp_dht_explorenetworkjob.cpp
+    dht/test_llarp_dht_kademlia.cpp
+    dht/test_llarp_dht_key.cpp
+    dht/test_llarp_dht_node.cpp
+    dht/test_llarp_dht_serviceaddresslookup.cpp
+    dht/test_llarp_dht_taglookup.cpp
+    dht/test_llarp_dht_tx.cpp
+    dht/test_llarp_dht_txowner.cpp
+    dns/test_llarp_dns_dns.cpp
+    exit/test_llarp_exit_context.cpp
+    link/test_llarp_link.cpp
+    net/test_llarp_net_inaddr.cpp
+    net/test_llarp_net.cpp
+    routing/llarp_routing_transfer_traffic.cpp
+    routing/test_llarp_routing_obtainexitmessage.cpp
+    service/test_llarp_service_address.cpp
+    service/test_llarp_service_identity.cpp
+    test_llarp_dns.cpp
+    test_llarp_dnsd.cpp
+    test_llarp_encrypted_frame.cpp
+    test_llarp_router_contact.cpp
+    test_llarp_router.cpp
+    util/test_llarp_util_aligned.cpp
+    util/test_llarp_util_bencode.cpp
+    util/test_llarp_util_bits.cpp
+    util/test_llarp_util_encode.cpp
+    util/test_llarp_util_ini.cpp
+    util/test_llarp_util_queue_manager.cpp
+    util/test_llarp_util_queue.cpp
+    util/test_llarp_util_thread_pool.cpp)
+
+target_link_libraries(${TEST_EXE} PUBLIC gmock gtest ${STATIC_LIB})
+target_include_directories(${TEST_EXE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(NOT WIN32)
+    target_link_libraries(${TEST_EXE} PUBLIC absl::variant)
+else()
+    target_sources(${TEST_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/win32/test.rc")
+    target_link_libraries(${TEST_EXE} PUBLIC ws2_32 iphlpapi)
+endif(NOT WIN32)
+
+
+if(USE_LIBABYSS)
+    target_sources(${TEST_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/test_libabyss.cpp")
+    target_link_libraries(${TEST_EXE} PUBLIC ${ABYSS_LIB})
+endif()
diff --git a/llarp/win32/test.rc b/test/win32/test.rc
similarity index 100%
rename from llarp/win32/test.rc
rename to test/win32/test.rc
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
new file mode 100644
index 000000000..ff40b951b
--- /dev/null
+++ b/vendor/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(CXX_COMPAT_SRC
+  cppbackport-master/lib/fs/rename.cpp
+  cppbackport-master/lib/fs/filestatus.cpp
+  cppbackport-master/lib/fs/filetype.cpp
+  cppbackport-master/lib/fs/cleanpath.cpp
+  cppbackport-master/lib/fs/perms.cpp
+  cppbackport-master/lib/fs/equivalent.cpp
+  cppbackport-master/lib/fs/current_path.cpp
+  cppbackport-master/lib/fs/basename.cpp
+  cppbackport-master/lib/fs/tempdir.cpp
+  cppbackport-master/lib/fs/create_directory.cpp
+  cppbackport-master/lib/fs/path.cpp
+  cppbackport-master/lib/fs/remove.cpp
+  cppbackport-master/lib/fs/diriter.cpp
+  cppbackport-master/lib/fs/copyfile.cpp
+  cppbackport-master/lib/fs/absolute.cpp
+  cppbackport-master/lib/fs/direntry.cpp
+)
+
+add_library(cppbackport OBJECT ${CXX_COMPAT_SRC})
+target_include_directories(cppbackport PUBLIC cppbackport-master/lib)