diff --git a/.vscode/launch.json b/.vscode/launch.json
index 68cb8d526..914831d68 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,9 +12,8 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug",
-            "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/nrf52dk/firmware.elf",
-            "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-gccarmnoneeabi/bin",
-            "svdPath": "/home/kevinh/.platformio/platforms/nordicnrf52/misc/svd/nrf52840.svd",
+            "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/tbeam/firmware.elf",
+            "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-xtensa32/bin",
             "preLaunchTask": {
                 "type": "PlatformIO",
                 "task": "Pre-Debug"
@@ -25,9 +24,8 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug (skip Pre-Debug)",
-            "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/nrf52dk/firmware.elf",
-            "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-gccarmnoneeabi/bin",
-            "svdPath": "/home/kevinh/.platformio/platforms/nordicnrf52/misc/svd/nrf52840.svd",
+            "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/tbeam/firmware.elf",
+            "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-xtensa32/bin",
             "internalConsoleOptions": "openOnSessionStart"
         }
     ]
diff --git a/bin/regen-protos.sh b/bin/regen-protos.sh
index bc6bc9b72..0f1ae43c6 100755
--- a/bin/regen-protos.sh
+++ b/bin/regen-protos.sh
@@ -3,4 +3,4 @@
 echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.1"
 # the nanopb tool seems to require that the .options file be in the current directory!
 cd proto
-../../nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:../src -I=../proto mesh.proto
+../../nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:../src/mesh -I=../proto mesh.proto
diff --git a/platformio.ini b/platformio.ini
index afba2b65f..46c72b145 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -31,7 +31,7 @@ board_build.partitions = partition-table.csv
 
 ; note: we add src to our include search path so that lmic_project_config can override
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
-build_flags = -Wno-missing-field-initializers -Isrc -Isrc/rf95 -Os -Wl,-Map,.pio/build/output.map 
+build_flags = -Wno-missing-field-initializers -Isrc -Isrc/rf95 -Isrc/mesh -Os -Wl,-Map,.pio/build/output.map 
   -DAXP_DEBUG_PORT=Serial 
   -DHW_VERSION_${sysenv.COUNTRY}
   -DAPP_VERSION=${sysenv.APP_VERSION}
diff --git a/src/MeshRadio.cpp b/src/mesh/MeshRadio.cpp
similarity index 100%
rename from src/MeshRadio.cpp
rename to src/mesh/MeshRadio.cpp
diff --git a/src/MeshRadio.h b/src/mesh/MeshRadio.h
similarity index 100%
rename from src/MeshRadio.h
rename to src/mesh/MeshRadio.h
diff --git a/src/MeshService.cpp b/src/mesh/MeshService.cpp
similarity index 100%
rename from src/MeshService.cpp
rename to src/mesh/MeshService.cpp
diff --git a/src/MeshService.h b/src/mesh/MeshService.h
similarity index 100%
rename from src/MeshService.h
rename to src/mesh/MeshService.h
diff --git a/src/MeshTypes.h b/src/mesh/MeshTypes.h
similarity index 100%
rename from src/MeshTypes.h
rename to src/mesh/MeshTypes.h
diff --git a/src/NodeDB.cpp b/src/mesh/NodeDB.cpp
similarity index 100%
rename from src/NodeDB.cpp
rename to src/mesh/NodeDB.cpp
diff --git a/src/NodeDB.h b/src/mesh/NodeDB.h
similarity index 100%
rename from src/NodeDB.h
rename to src/mesh/NodeDB.h
diff --git a/src/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
similarity index 100%
rename from src/PhoneAPI.cpp
rename to src/mesh/PhoneAPI.cpp
diff --git a/src/PhoneAPI.h b/src/mesh/PhoneAPI.h
similarity index 100%
rename from src/PhoneAPI.h
rename to src/mesh/PhoneAPI.h
diff --git a/src/mesh-pb-constants.cpp b/src/mesh/mesh-pb-constants.cpp
similarity index 100%
rename from src/mesh-pb-constants.cpp
rename to src/mesh/mesh-pb-constants.cpp
diff --git a/src/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
similarity index 100%
rename from src/mesh-pb-constants.h
rename to src/mesh/mesh-pb-constants.h
diff --git a/src/mesh.pb.c b/src/mesh/mesh.pb.c
similarity index 100%
rename from src/mesh.pb.c
rename to src/mesh/mesh.pb.c
diff --git a/src/mesh.pb.h b/src/mesh/mesh.pb.h
similarity index 100%
rename from src/mesh.pb.h
rename to src/mesh/mesh.pb.h