diff --git a/bin/regen-protobufs.sh b/bin/regen-protobufs.sh
index 447c91f..e97d739 100755
--- a/bin/regen-protobufs.sh
+++ b/bin/regen-protobufs.sh
@@ -4,7 +4,7 @@
 #gsed -i 's/import "\//import ".\//g' ./protobufs/meshtastic/*
 #gsed -i 's/package meshtastic;//g' ./protobufs/meshtastic/*
 
-./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
+./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./pbDefinitions ./protobufs/meshtastic/*.proto
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
 
diff --git a/meshtastic/__init__.py b/meshtastic/__init__.py
index c338d18..628cce9 100644
--- a/meshtastic/__init__.py
+++ b/meshtastic/__init__.py
@@ -78,7 +78,7 @@ from google.protobuf.json_format import MessageToJson
 from pubsub import pub
 from tabulate import tabulate
 
-from meshtastic import (
+from meshtastic.pbDefinitions import (
     admin_pb2,
     apponly_pb2,
     channel_pb2,
@@ -86,10 +86,10 @@ from meshtastic import (
     mesh_pb2,
     portnums_pb2,
     remote_hardware_pb2,
-    telemetry_pb2,
     util,
 )
 from meshtastic.node import Node
+from meshtastic.pbDefinitions import telemetry_pb2
 from meshtastic.util import DeferredExecution, Timeout, catchAndIgnore, fixme, stripnl
 
 # Note: To follow PEP224, comments should be after the module variable.
diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py
index 6a2f31c..7d0350d 100644
--- a/meshtastic/__main__.py
+++ b/meshtastic/__main__.py
@@ -17,7 +17,7 @@ from pubsub import pub
 
 import meshtastic.test
 import meshtastic.util
-from meshtastic import channel_pb2, config_pb2, portnums_pb2, remote_hardware
+from meshtastic.pbDefinitions import channel_pb2, config_pb2, portnums_pb2, remote_hardware
 from meshtastic.__init__ import BROADCAST_ADDR
 from meshtastic.ble_interface import BLEInterface
 from meshtastic.globals import Globals
diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py
index 1090fc0..b602c11 100644
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -18,7 +18,7 @@ from pubsub import pub
 from tabulate import tabulate
 
 import meshtastic.node
-from meshtastic import mesh_pb2, portnums_pb2, telemetry_pb2
+from meshtastic.pbDefinitions import mesh_pb2, portnums_pb2
 from meshtastic.__init__ import (
     BROADCAST_ADDR,
     BROADCAST_NUM,
@@ -28,6 +28,7 @@ from meshtastic.__init__ import (
     protocols,
     publishingThread,
 )
+from meshtastic.pbDefinitions import telemetry_pb2
 from meshtastic.util import (
     Acknowledgment,
     Timeout,
diff --git a/meshtastic/node.py b/meshtastic/node.py
index c5a57bd..1767fb0 100644
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -7,7 +7,8 @@ import time
 
 from google.protobuf.json_format import MessageToJson
 
-from meshtastic import admin_pb2, apponly_pb2, channel_pb2, localonly_pb2, portnums_pb2
+from meshtastic.pbDefinitions import admin_pb2, apponly_pb2, channel_pb2, portnums_pb2
+from meshtastic.pbDefinitions import localonly_pb2
 from meshtastic.util import (
     Timeout,
     camel_to_snake,
diff --git a/meshtastic/pbDefinitions/__init__.py b/meshtastic/pbDefinitions/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/meshtastic/admin_pb2.py b/meshtastic/pbDefinitions/admin_pb2.py
similarity index 100%
rename from meshtastic/admin_pb2.py
rename to meshtastic/pbDefinitions/admin_pb2.py
diff --git a/meshtastic/apponly_pb2.py b/meshtastic/pbDefinitions/apponly_pb2.py
similarity index 100%
rename from meshtastic/apponly_pb2.py
rename to meshtastic/pbDefinitions/apponly_pb2.py
diff --git a/meshtastic/atak_pb2.py b/meshtastic/pbDefinitions/atak_pb2.py
similarity index 100%
rename from meshtastic/atak_pb2.py
rename to meshtastic/pbDefinitions/atak_pb2.py
diff --git a/meshtastic/cannedmessages_pb2.py b/meshtastic/pbDefinitions/cannedmessages_pb2.py
similarity index 100%
rename from meshtastic/cannedmessages_pb2.py
rename to meshtastic/pbDefinitions/cannedmessages_pb2.py
diff --git a/meshtastic/channel_pb2.py b/meshtastic/pbDefinitions/channel_pb2.py
similarity index 100%
rename from meshtastic/channel_pb2.py
rename to meshtastic/pbDefinitions/channel_pb2.py
diff --git a/meshtastic/clientonly_pb2.py b/meshtastic/pbDefinitions/clientonly_pb2.py
similarity index 95%
rename from meshtastic/clientonly_pb2.py
rename to meshtastic/pbDefinitions/clientonly_pb2.py
index ebb5111..e279717 100644
--- a/meshtastic/clientonly_pb2.py
+++ b/meshtastic/pbDefinitions/clientonly_pb2.py
@@ -11,7 +11,7 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()
 
 
-from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
+from meshtastic.pbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/clientonly.proto\x1a\x1ameshtastic/localonly.proto\"\xf7\x01\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12!\n\x06\x63onfig\x18\x04 \x01(\x0b\x32\x0c.LocalConfigH\x03\x88\x01\x01\x12.\n\rmodule_config\x18\x05 \x01(\x0b\x32\x12.LocalModuleConfigH\x04\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configBe\n\x13\x63om.geeksville.meshB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
diff --git a/meshtastic/config_pb2.py b/meshtastic/pbDefinitions/config_pb2.py
similarity index 100%
rename from meshtastic/config_pb2.py
rename to meshtastic/pbDefinitions/config_pb2.py
diff --git a/meshtastic/connection_status_pb2.py b/meshtastic/pbDefinitions/connection_status_pb2.py
similarity index 100%
rename from meshtastic/connection_status_pb2.py
rename to meshtastic/pbDefinitions/connection_status_pb2.py
diff --git a/meshtastic/device_metadata_pb2.py b/meshtastic/pbDefinitions/device_metadata_pb2.py
similarity index 100%
rename from meshtastic/device_metadata_pb2.py
rename to meshtastic/pbDefinitions/device_metadata_pb2.py
diff --git a/meshtastic/deviceonly_pb2.py b/meshtastic/pbDefinitions/deviceonly_pb2.py
similarity index 96%
rename from meshtastic/deviceonly_pb2.py
rename to meshtastic/pbDefinitions/deviceonly_pb2.py
index a0d00e4..4fef9dd 100644
--- a/meshtastic/deviceonly_pb2.py
+++ b/meshtastic/pbDefinitions/deviceonly_pb2.py
@@ -12,9 +12,9 @@ _sym_db = _symbol_database.Default()
 
 
 from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
-from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
+from meshtastic.pbDefinitions import localonly_pb2 as meshtastic_dot_localonly__pb2
 from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
-from meshtastic import telemetry_pb2 as meshtastic_dot_telemetry__pb2
+from meshtastic.pbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2
 from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
 
 
diff --git a/meshtastic/localonly_pb2.py b/meshtastic/pbDefinitions/localonly_pb2.py
similarity index 100%
rename from meshtastic/localonly_pb2.py
rename to meshtastic/pbDefinitions/localonly_pb2.py
diff --git a/meshtastic/mesh_pb2.py b/meshtastic/pbDefinitions/mesh_pb2.py
similarity index 98%
rename from meshtastic/mesh_pb2.py
rename to meshtastic/pbDefinitions/mesh_pb2.py
index f6ffe7b..4628617 100644
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/pbDefinitions/mesh_pb2.py
@@ -15,8 +15,8 @@ from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
 from meshtastic import config_pb2 as meshtastic_dot_config__pb2
 from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
 from meshtastic import portnums_pb2 as meshtastic_dot_portnums__pb2
-from meshtastic import telemetry_pb2 as meshtastic_dot_telemetry__pb2
-from meshtastic import xmodem_pb2 as meshtastic_dot_xmodem__pb2
+from meshtastic.pbDefinitions import telemetry_pb2 as meshtastic_dot_telemetry__pb2
+from meshtastic.pbDefinitions import xmodem_pb2 as meshtastic_dot_xmodem__pb2
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/mesh.proto\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\x1a\x1emeshtastic/module_config.proto\x1a\x19meshtastic/portnums.proto\x1a\x1ameshtastic/telemetry.proto\x1a\x17meshtastic/xmodem.proto\"\xb7\x05\n\x08Position\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12,\n\x0flocation_source\x18\x05 \x01(\x0e\x32\x13.Position.LocSource\x12,\n\x0f\x61ltitude_source\x18\x06 \x01(\x0e\x32\x13.Position.AltSource\x12\x11\n\ttimestamp\x18\x07 \x01(\x07\x12\x1f\n\x17timestamp_millis_adjust\x18\x08 \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\t \x01(\x11\x12#\n\x1b\x61ltitude_geoidal_separation\x18\n \x01(\x11\x12\x0c\n\x04PDOP\x18\x0b \x01(\r\x12\x0c\n\x04HDOP\x18\x0c \x01(\r\x12\x0c\n\x04VDOP\x18\r \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x0e \x01(\r\x12\x14\n\x0cground_speed\x18\x0f \x01(\r\x12\x14\n\x0cground_track\x18\x10 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x11 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x12 \x01(\r\x12\x14\n\x0csats_in_view\x18\x13 \x01(\r\x12\x11\n\tsensor_id\x18\x14 \x01(\r\x12\x13\n\x0bnext_update\x18\x15 \x01(\r\x12\x12\n\nseq_number\x18\x16 \x01(\r\"N\n\tLocSource\x12\r\n\tLOC_UNSET\x10\x00\x12\x0e\n\nLOC_MANUAL\x10\x01\x12\x10\n\x0cLOC_INTERNAL\x10\x02\x12\x10\n\x0cLOC_EXTERNAL\x10\x03\"b\n\tAltSource\x12\r\n\tALT_UNSET\x10\x00\x12\x0e\n\nALT_MANUAL\x10\x01\x12\x10\n\x0c\x41LT_INTERNAL\x10\x02\x12\x10\n\x0c\x41LT_EXTERNAL\x10\x03\x12\x12\n\x0e\x41LT_BAROMETRIC\x10\x04\"\xae\x01\n\x04User\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x13\n\x07macaddr\x18\x04 \x01(\x0c\x42\x02\x18\x01\x12 \n\x08hw_model\x18\x05 \x01(\x0e\x32\x0e.HardwareModel\x12\x13\n\x0bis_licensed\x18\x06 \x01(\x08\x12\'\n\x04role\x18\x07 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x01 \x03(\x07\"\xdb\x02\n\x07Routing\x12(\n\rroute_request\x18\x01 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x0e.Routing.ErrorH\x00\"\xca\x01\n\x05\x45rror\x12\x08\n\x04NONE\x10\x00\x12\x0c\n\x08NO_ROUTE\x10\x01\x12\x0b\n\x07GOT_NAK\x10\x02\x12\x0b\n\x07TIMEOUT\x10\x03\x12\x10\n\x0cNO_INTERFACE\x10\x04\x12\x12\n\x0eMAX_RETRANSMIT\x10\x05\x12\x0e\n\nNO_CHANNEL\x10\x06\x12\r\n\tTOO_LARGE\x10\x07\x12\x0f\n\x0bNO_RESPONSE\x10\x08\x12\x14\n\x10\x44UTY_CYCLE_LIMIT\x10\t\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\x9c\x01\n\x04\x44\x61ta\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.PortNum\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x15\n\rwant_response\x18\x03 \x01(\x08\x12\x0c\n\x04\x64\x65st\x18\x04 \x01(\x07\x12\x0e\n\x06source\x18\x05 \x01(\x07\x12\x12\n\nrequest_id\x18\x06 \x01(\x07\x12\x10\n\x08reply_id\x18\x07 \x01(\x07\x12\r\n\x05\x65moji\x18\x08 \x01(\x07\"\x93\x01\n\x08Waypoint\x12\n\n\x02id\x18\x01 \x01(\r\x12\x12\n\nlatitude_i\x18\x02 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x03 \x01(\x0f\x12\x0e\n\x06\x65xpire\x18\x04 \x01(\r\x12\x11\n\tlocked_to\x18\x05 \x01(\r\x12\x0c\n\x04name\x18\x06 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x07 \x01(\t\x12\x0c\n\x04icon\x18\x08 \x01(\x07\"l\n\x16MqttClientProxyMessage\x12\r\n\x05topic\x18\x01 \x01(\t\x12\x0e\n\x04\x64\x61ta\x18\x02 \x01(\x0cH\x00\x12\x0e\n\x04text\x18\x03 \x01(\tH\x00\x12\x10\n\x08retained\x18\x04 \x01(\x08\x42\x11\n\x0fpayload_variant\"\xe1\x03\n\nMeshPacket\x12\x0c\n\x04\x66rom\x18\x01 \x01(\x07\x12\n\n\x02to\x18\x02 \x01(\x07\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\r\x12\x18\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x05.DataH\x00\x12\x13\n\tencrypted\x18\x05 \x01(\x0cH\x00\x12\n\n\x02id\x18\x06 \x01(\x07\x12\x0f\n\x07rx_time\x18\x07 \x01(\x07\x12\x0e\n\x06rx_snr\x18\x08 \x01(\x02\x12\x11\n\thop_limit\x18\t \x01(\r\x12\x10\n\x08want_ack\x18\n \x01(\x08\x12&\n\x08priority\x18\x0b \x01(\x0e\x32\x14.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\x0c \x01(\x05\x12(\n\x07\x64\x65layed\x18\r \x01(\x0e\x32\x13.MeshPacket.DelayedB\x02\x18\x01\x12\x10\n\x08via_mqtt\x18\x0e \x01(\x08\"[\n\x08Priority\x12\t\n\x05UNSET\x10\x00\x12\x07\n\x03MIN\x10\x01\x12\x0e\n\nBACKGROUND\x10\n\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10@\x12\x0c\n\x08RELIABLE\x10\x46\x12\x07\n\x03\x41\x43K\x10x\x12\x07\n\x03MAX\x10\x7f\"B\n\x07\x44\x65layed\x12\x0c\n\x08NO_DELAY\x10\x00\x12\x15\n\x11\x44\x45LAYED_BROADCAST\x10\x01\x12\x12\n\x0e\x44\x45LAYED_DIRECT\x10\x02\x42\x11\n\x0fpayload_variant\"\xa3\x01\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x13\n\x04user\x18\x02 \x01(\x0b\x32\x05.User\x12\x1b\n\x08position\x18\x03 \x01(\x0b\x32\t.Position\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12&\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\x0e.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\"P\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x14\n\x0creboot_count\x18\x08 \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0b \x01(\r\"\xb5\x01\n\tLogRecord\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0c\n\x04time\x18\x02 \x01(\x07\x12\x0e\n\x06source\x18\x03 \x01(\t\x12\x1f\n\x05level\x18\x04 \x01(\x0e\x32\x10.LogRecord.Level\"X\n\x05Level\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08\x43RITICAL\x10\x32\x12\t\n\x05\x45RROR\x10(\x12\x0b\n\x07WARNING\x10\x1e\x12\x08\n\x04INFO\x10\x14\x12\t\n\x05\x44\x45\x42UG\x10\n\x12\t\n\x05TRACE\x10\x05\"P\n\x0bQueueStatus\x12\x0b\n\x03res\x18\x01 \x01(\x05\x12\x0c\n\x04\x66ree\x18\x02 \x01(\r\x12\x0e\n\x06maxlen\x18\x03 \x01(\r\x12\x16\n\x0emesh_packet_id\x18\x04 \x01(\r\"\xe2\x03\n\tFromRadio\x12\n\n\x02id\x18\x01 \x01(\r\x12\x1d\n\x06packet\x18\x02 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x1e\n\x07my_info\x18\x03 \x01(\x0b\x32\x0b.MyNodeInfoH\x00\x12\x1e\n\tnode_info\x18\x04 \x01(\x0b\x32\t.NodeInfoH\x00\x12\x19\n\x06\x63onfig\x18\x05 \x01(\x0b\x32\x07.ConfigH\x00\x12 \n\nlog_record\x18\x06 \x01(\x0b\x32\n.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x07 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\x08 \x01(\x08H\x00\x12%\n\x0cmoduleConfig\x18\t \x01(\x0b\x32\r.ModuleConfigH\x00\x12\x1b\n\x07\x63hannel\x18\n \x01(\x0b\x32\x08.ChannelH\x00\x12#\n\x0bqueueStatus\x18\x0b \x01(\x0b\x32\x0c.QueueStatusH\x00\x12\x1f\n\x0cxmodemPacket\x18\x0c \x01(\x0b\x32\x07.XModemH\x00\x12#\n\x08metadata\x18\r \x01(\x0b\x32\x0f.DeviceMetadataH\x00\x12\x39\n\x16mqttClientProxyMessage\x18\x0e \x01(\x0b\x32\x17.MqttClientProxyMessageH\x00\x42\x11\n\x0fpayload_variant\"\xc7\x01\n\x07ToRadio\x12\x1d\n\x06packet\x18\x01 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x18\n\x0ewant_config_id\x18\x03 \x01(\rH\x00\x12\x14\n\ndisconnect\x18\x04 \x01(\x08H\x00\x12\x1f\n\x0cxmodemPacket\x18\x05 \x01(\x0b\x32\x07.XModemH\x00\x12\x39\n\x16mqttClientProxyMessage\x18\x06 \x01(\x0b\x32\x17.MqttClientProxyMessageH\x00\x42\x11\n\x0fpayload_variant\"5\n\nCompressed\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.PortNum\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"|\n\x0cNeighborInfo\x12\x0f\n\x07node_id\x18\x01 \x01(\r\x12\x17\n\x0flast_sent_by_id\x18\x02 \x01(\r\x12$\n\x1cnode_broadcast_interval_secs\x18\x03 \x01(\r\x12\x1c\n\tneighbors\x18\x04 \x03(\x0b\x32\t.Neighbor\"d\n\x08Neighbor\x12\x0f\n\x07node_id\x18\x01 \x01(\r\x12\x0b\n\x03snr\x18\x02 \x01(\x02\x12\x14\n\x0clast_rx_time\x18\x03 \x01(\x07\x12$\n\x1cnode_broadcast_interval_secs\x18\x04 \x01(\r\"\x97\x02\n\x0e\x44\x65viceMetadata\x12\x18\n\x10\x66irmware_version\x18\x01 \x01(\t\x12\x1c\n\x14\x64\x65vice_state_version\x18\x02 \x01(\r\x12\x13\n\x0b\x63\x61nShutdown\x18\x03 \x01(\x08\x12\x0f\n\x07hasWifi\x18\x04 \x01(\x08\x12\x14\n\x0chasBluetooth\x18\x05 \x01(\x08\x12\x13\n\x0bhasEthernet\x18\x06 \x01(\x08\x12\'\n\x04role\x18\x07 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x16\n\x0eposition_flags\x18\x08 \x01(\r\x12 \n\x08hw_model\x18\t \x01(\x0e\x32\x0e.HardwareModel\x12\x19\n\x11hasRemoteHardware\x18\n \x01(\x08*\xc4\x07\n\rHardwareModel\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08TLORA_V2\x10\x01\x12\x0c\n\x08TLORA_V1\x10\x02\x12\x12\n\x0eTLORA_V2_1_1P6\x10\x03\x12\t\n\x05TBEAM\x10\x04\x12\x0f\n\x0bHELTEC_V2_0\x10\x05\x12\x0e\n\nTBEAM_V0P7\x10\x06\x12\n\n\x06T_ECHO\x10\x07\x12\x10\n\x0cTLORA_V1_1P3\x10\x08\x12\x0b\n\x07RAK4631\x10\t\x12\x0f\n\x0bHELTEC_V2_1\x10\n\x12\r\n\tHELTEC_V1\x10\x0b\x12\x18\n\x14LILYGO_TBEAM_S3_CORE\x10\x0c\x12\x0c\n\x08RAK11200\x10\r\x12\x0b\n\x07NANO_G1\x10\x0e\x12\x12\n\x0eTLORA_V2_1_1P8\x10\x0f\x12\x0f\n\x0bTLORA_T3_S3\x10\x10\x12\x14\n\x10NANO_G1_EXPLORER\x10\x11\x12\x11\n\rNANO_G2_ULTRA\x10\x12\x12\r\n\tLORA_TYPE\x10\x13\x12\x0e\n\nSTATION_G1\x10\x19\x12\x0c\n\x08RAK11310\x10\x1a\x12\x14\n\x10SENSELORA_RP2040\x10\x1b\x12\x10\n\x0cSENSELORA_S3\x10\x1c\x12\r\n\tCANARYONE\x10\x1d\x12\x0f\n\x0bRP2040_LORA\x10\x1e\x12\x11\n\rLORA_RELAY_V1\x10 \x12\x0e\n\nNRF52840DK\x10!\x12\x07\n\x03PPR\x10\"\x12\x0f\n\x0bGENIEBLOCKS\x10#\x12\x11\n\rNRF52_UNKNOWN\x10$\x12\r\n\tPORTDUINO\x10%\x12\x0f\n\x0b\x41NDROID_SIM\x10&\x12\n\n\x06\x44IY_V1\x10\'\x12\x15\n\x11NRF52840_PCA10059\x10(\x12\n\n\x06\x44R_DEV\x10)\x12\x0b\n\x07M5STACK\x10*\x12\r\n\tHELTEC_V3\x10+\x12\x11\n\rHELTEC_WSL_V3\x10,\x12\x13\n\x0f\x42\x45TAFPV_2400_TX\x10-\x12\x17\n\x13\x42\x45TAFPV_900_NANO_TX\x10.\x12\x0c\n\x08RPI_PICO\x10/\x12\x1b\n\x17HELTEC_WIRELESS_TRACKER\x10\x30\x12\x19\n\x15HELTEC_WIRELESS_PAPER\x10\x31\x12\n\n\x06T_DECK\x10\x32\x12\x0e\n\nT_WATCH_S3\x10\x33\x12\x11\n\rPICOMPUTER_S3\x10\x34\x12\x0f\n\x0bHELTEC_HT62\x10\x35\x12\x12\n\x0e\x45\x42YTE_ESP32_S3\x10\x36\x12\x11\n\rESP32_S3_PICO\x10\x37\x12\r\n\tCHATTER_2\x10\x38\x12\x1e\n\x1aHELTEC_WIRELESS_PAPER_V1_0\x10\x39\x12 \n\x1cHELTEC_WIRELESS_TRACKER_V1_0\x10:\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*,\n\tConstants\x12\x08\n\x04ZERO\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xee\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04NONE\x10\x00\x12\x0f\n\x0bTX_WATCHDOG\x10\x01\x12\x14\n\x10SLEEP_ENTER_WAIT\x10\x02\x12\x0c\n\x08NO_RADIO\x10\x03\x12\x0f\n\x0bUNSPECIFIED\x10\x04\x12\x15\n\x11UBLOX_UNIT_FAILED\x10\x05\x12\r\n\tNO_AXP192\x10\x06\x12\x19\n\x15INVALID_RADIO_SETTING\x10\x07\x12\x13\n\x0fTRANSMIT_FAILED\x10\x08\x12\x0c\n\x08\x42ROWNOUT\x10\t\x12\x12\n\x0eSX1262_FAILURE\x10\n\x12\x11\n\rRADIO_SPI_BUG\x10\x0b\x42_\n\x13\x63om.geeksville.meshB\nMeshProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
diff --git a/meshtastic/module_config_pb2.py b/meshtastic/pbDefinitions/module_config_pb2.py
similarity index 100%
rename from meshtastic/module_config_pb2.py
rename to meshtastic/pbDefinitions/module_config_pb2.py
diff --git a/meshtastic/mqtt_pb2.py b/meshtastic/pbDefinitions/mqtt_pb2.py
similarity index 100%
rename from meshtastic/mqtt_pb2.py
rename to meshtastic/pbDefinitions/mqtt_pb2.py
diff --git a/meshtastic/paxcount_pb2.py b/meshtastic/pbDefinitions/paxcount_pb2.py
similarity index 100%
rename from meshtastic/paxcount_pb2.py
rename to meshtastic/pbDefinitions/paxcount_pb2.py
diff --git a/meshtastic/portnums_pb2.py b/meshtastic/pbDefinitions/portnums_pb2.py
similarity index 100%
rename from meshtastic/portnums_pb2.py
rename to meshtastic/pbDefinitions/portnums_pb2.py
diff --git a/meshtastic/remote_hardware_pb2.py b/meshtastic/pbDefinitions/remote_hardware_pb2.py
similarity index 100%
rename from meshtastic/remote_hardware_pb2.py
rename to meshtastic/pbDefinitions/remote_hardware_pb2.py
diff --git a/meshtastic/rtttl_pb2.py b/meshtastic/pbDefinitions/rtttl_pb2.py
similarity index 100%
rename from meshtastic/rtttl_pb2.py
rename to meshtastic/pbDefinitions/rtttl_pb2.py
diff --git a/meshtastic/storeforward_pb2.py b/meshtastic/pbDefinitions/storeforward_pb2.py
similarity index 100%
rename from meshtastic/storeforward_pb2.py
rename to meshtastic/pbDefinitions/storeforward_pb2.py
diff --git a/meshtastic/telemetry_pb2.py b/meshtastic/pbDefinitions/telemetry_pb2.py
similarity index 100%
rename from meshtastic/telemetry_pb2.py
rename to meshtastic/pbDefinitions/telemetry_pb2.py
diff --git a/meshtastic/xmodem_pb2.py b/meshtastic/pbDefinitions/xmodem_pb2.py
similarity index 100%
rename from meshtastic/xmodem_pb2.py
rename to meshtastic/pbDefinitions/xmodem_pb2.py
diff --git a/meshtastic/remote_hardware.py b/meshtastic/remote_hardware.py
index b8fbc94..e157f75 100644
--- a/meshtastic/remote_hardware.py
+++ b/meshtastic/remote_hardware.py
@@ -4,7 +4,7 @@ import logging
 
 from pubsub import pub
 
-from meshtastic import portnums_pb2, remote_hardware_pb2
+from meshtastic.pbDefinitions import portnums_pb2, remote_hardware_pb2
 from meshtastic.util import our_exit
 
 
diff --git a/meshtastic/tunnel.py b/meshtastic/tunnel.py
index b3fe7d4..9880305 100644
--- a/meshtastic/tunnel.py
+++ b/meshtastic/tunnel.py
@@ -22,7 +22,7 @@ import threading
 from pubsub import pub
 from pytap2 import TapDevice
 
-from meshtastic import portnums_pb2
+from meshtastic.pbDefinitions import portnums_pb2
 from meshtastic.globals import Globals
 from meshtastic.util import ipstr, readnet_u16