diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 65f39eec5..a548968f6 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -244,7 +244,6 @@ target_include_directories(proxmark3 PRIVATE
         ../common
         ../include
         src
-        src/uart
 )
 
 if (APPLE)
diff --git a/client/Makefile b/client/Makefile
index efd251413..9172e1908 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -17,7 +17,7 @@ include ../Makefile.defs
 INSTALLBIN = proxmark3
 INSTALLSHARE = cmdscripts lualibs luascripts resources dictionaries
 
-VPATH =  ../common src/uart src
+VPATH =  ../common src
 vpath %.dic dictionaries
 OBJDIR = obj
 
@@ -54,7 +54,7 @@ ZLIBPATH = ../common/zlib
 ZLIB = $(OBJDIR)/libz.a
 
 LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH)
-INCLUDES_CLIENT = -I./src -I../include -I../common -I./src/uart $(LIBS)
+INCLUDES_CLIENT = -I./src -I../include -I../common $(LIBS)
 CFLAGS ?= -Wall -Werror -O3
 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
 PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT)
@@ -129,8 +129,8 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
 # make temporary to final dependency files after successful compilation
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d && $(TOUCH) $@
 
-CORESRCS =  uart_posix.c \
-            uart_win32.c \
+CORESRCS =  uart/uart_posix.c \
+            uart/uart_win32.c \
             ui.c \
             commonutil.c \
             util.c \
diff --git a/client/src/cmddata.c b/client/src/cmddata.c
index ce8190ace..205e6e957 100644
--- a/client/src/cmddata.c
+++ b/client/src/cmddata.c
@@ -21,7 +21,7 @@
 #include "graph.h"               // for graph data
 #include "comms.h"
 #include "lfdemod.h"             // for demod code
-#include "../loclass/cipherutils.h" // for decimating samples in getsamples
+#include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h"           // askem410xdecode
 #include "fileutils.h"           // searchFile
 #include "mifare/ndef.h"
diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index 9762ba498..4d2e5c544 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -29,7 +29,7 @@
 #include "comms.h"        // clearCommandBuffer
 #include "cmdtrace.h"
 #include "iso15693tools.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "graph.h"
 #include "crc16.h"             // iso15 crc
 #include "cmddata.h"           // getsamples
diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c
index 9bb5bf604..e35479db9 100644
--- a/client/src/cmdhffido.c
+++ b/client/src/cmdhffido.c
@@ -31,8 +31,8 @@
 #include "emv/emvcore.h"
 #include "emv/emvjson.h"
 #include "cliparser.h"
-#include "../crypto/asn1utils.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/asn1utils.h"
+#include "crypto/libpcrypto.h"
 #include "fido/cbortools.h"
 #include "fido/fidocore.h"
 #include "emv/dump.h"
diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index 73163e1ea..a9d8c1f9c 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -19,10 +19,10 @@
 #include "util_posix.h"
 #include "comms.h"
 #include "mbedtls/des.h"
-#include "../loclass/cipherutils.h"
-#include "../loclass/cipher.h"
-#include "../loclass/ikeys.h"
-#include "../loclass/elite_crack.h"
+#include "loclass/cipherutils.h"
+#include "loclass/cipher.h"
+#include "loclass/ikeys.h"
+#include "loclass/elite_crack.h"
 #include "fileutils.h"
 #include "protocols.h"
 #include "cardhelper.h"
diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index 101e1d9d9..ecbeba3b5 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -20,7 +20,7 @@
 #include "cmdhf14a.h"
 #include "mbedtls/des.h"
 #include "mbedtls/aes.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "protocols.h"
 #include "mifare.h"         // desfire raw command options
 #include "cmdtrace.h"
diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c
index c007345e7..b2b4e368e 100644
--- a/client/src/cmdhfmfp.c
+++ b/client/src/cmdhfmfp.c
@@ -25,7 +25,7 @@
 #include "util_posix.h"
 #include "fileutils.h"
 #include "protocols.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};
diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c
index 425ab435f..92887a1d1 100644
--- a/client/src/cmdhfmfu.c
+++ b/client/src/cmdhfmfu.c
@@ -11,7 +11,7 @@
 #include <ctype.h>
 #include "cmdparser.h"
 #include "commonutil.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "mbedtls/des.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c
index 36b7155e7..ba48fae96 100644
--- a/client/src/cmdsmartcard.c
+++ b/client/src/cmdsmartcard.c
@@ -19,7 +19,7 @@
 #include "proxmark3.h"
 #include "comms.h"              // getfromdevice
 #include "emv/emvcore.h"        // decodeTVL
-#include "../crypto/libpcrypto.h"  // sha512hash
+#include "crypto/libpcrypto.h"  // sha512hash
 #include "emv/dump.h"
 #include "ui.h"
 #include "fileutils.h"
diff --git a/client/src/comms.c b/client/src/comms.c
index a551e59e3..b5055803b 100644
--- a/client/src/comms.c
+++ b/client/src/comms.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "uart.h"
+#include "uart/uart.h"
 #include "ui.h"
 #include "crc16.h"
 #include "util_posix.h" // msclock