diff --git a/platformio.ini b/platformio.ini
index d45101430..f19c6a526 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -196,7 +196,7 @@ build_flags =
   -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.7 
 ;-DCFG_DEBUG=3
 src_filter = 
-  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<plugins/esp32> -<mqtt/>
+  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
 lib_ignore =
   BluetoothOTA
 ; monitor_port = /dev/ttyACM1
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index e679227f7..ede88e41c 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
-#include "plugins/TextMessagePlugin.h"
+#include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
diff --git a/src/main.cpp b/src/main.cpp
index 544040ac0..68c21c502 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 #include "concurrency/Periodic.h"
 #include "graphics/Screen.h"
 #include "main.h"
-#include "plugins/Plugins.h"
+#include "modules/Modules.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <OneButton.h>
diff --git a/src/mesh/MeshPlugin.cpp b/src/mesh/MeshPlugin.cpp
index 180e1ebfd..323f56363 100644
--- a/src/mesh/MeshPlugin.cpp
+++ b/src/mesh/MeshPlugin.cpp
@@ -3,7 +3,7 @@
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "plugins/RoutingPlugin.h"
+#include "modules/RoutingModule.h"
 #include <assert.h>
 
 std::vector<MeshPlugin *> *MeshPlugin::plugins;
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index bbc75e38b..d9de5f52d 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -12,8 +12,8 @@
 #include "RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "plugins/NodeInfoPlugin.h"
-#include "plugins/PositionPlugin.h"
+#include "modules/NodeInfoModule.h"
+#include "modules/PositionModule.h"
 #include "power.h"
 
 /*
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 0587b9457..fd7203f7d 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -19,7 +19,7 @@
 
 #ifndef NO_ESP32
 #include "mesh/http/WiFiAPClient.h"
-#include "plugins/esp32/StoreForwardPlugin.h"
+#include "modules/esp32/StoreForwardPlugin.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
 #endif
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 64e0a4795..6fac3739f 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -6,7 +6,7 @@
 #include "RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "plugins/RoutingPlugin.h"
+#include "modules/RoutingModule.h"
 
 #if defined(HAS_WIFI) || defined(PORTDUINO)
 #include "mqtt/MQTT.h"
diff --git a/src/plugins/AdminPlugin.cpp b/src/modules/AdminModule.cpp
similarity index 99%
rename from src/plugins/AdminPlugin.cpp
rename to src/modules/AdminModule.cpp
index 2f1893a87..5123a93c8 100644
--- a/src/plugins/AdminPlugin.cpp
+++ b/src/modules/AdminModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "AdminPlugin.h"
+#include "AdminModule.h"
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
diff --git a/src/plugins/AdminPlugin.h b/src/modules/AdminModule.h
similarity index 100%
rename from src/plugins/AdminPlugin.h
rename to src/modules/AdminModule.h
diff --git a/src/plugins/CannedMessagePlugin.cpp b/src/modules/CannedMessageModule.cpp
similarity index 99%
rename from src/plugins/CannedMessagePlugin.cpp
rename to src/modules/CannedMessageModule.cpp
index a6b9a23f4..0d2a15715 100644
--- a/src/plugins/CannedMessagePlugin.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "CannedMessagePlugin.h"
+#include "CannedMessageModule.h"
 #include "MeshService.h"
 #include "FSCommon.h"
 #include "mesh/generated/cannedmessages.pb.h"
diff --git a/src/plugins/CannedMessagePlugin.h b/src/modules/CannedMessageModule.h
similarity index 100%
rename from src/plugins/CannedMessagePlugin.h
rename to src/modules/CannedMessageModule.h
diff --git a/src/plugins/ExternalNotificationPlugin.cpp b/src/modules/ExternalNotificationModule.cpp
similarity index 98%
rename from src/plugins/ExternalNotificationPlugin.cpp
rename to src/modules/ExternalNotificationModule.cpp
index 122c77be8..59827e6f8 100644
--- a/src/plugins/ExternalNotificationPlugin.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "ExternalNotificationPlugin.h"
+#include "ExternalNotificationModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
@@ -11,7 +11,7 @@
 /*
 
     Documentation:
-        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/plugins/ExternalNotificationPlugin.md
+        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationModule.md
 
     This plugin supports:
         https://github.com/meshtastic/Meshtastic-device/issues/654
diff --git a/src/plugins/ExternalNotificationPlugin.h b/src/modules/ExternalNotificationModule.h
similarity index 100%
rename from src/plugins/ExternalNotificationPlugin.h
rename to src/modules/ExternalNotificationModule.h
diff --git a/src/plugins/PluginDev.h b/src/modules/ModuleDev.h
similarity index 100%
rename from src/plugins/PluginDev.h
rename to src/modules/ModuleDev.h
diff --git a/src/plugins/Plugins.cpp b/src/modules/Modules.cpp
similarity index 74%
rename from src/plugins/Plugins.cpp
rename to src/modules/Modules.cpp
index f2dc7a7df..915ac0d4f 100644
--- a/src/plugins/Plugins.cpp
+++ b/src/modules/Modules.cpp
@@ -1,22 +1,22 @@
 #include "configuration.h"
 #include "input/InputBroker.h"
 #include "input/RotaryEncoderInterruptImpl1.h"
-#include "plugins/AdminPlugin.h"
-#include "plugins/CannedMessagePlugin.h"
-#include "plugins/ExternalNotificationPlugin.h"
-#include "plugins/NodeInfoPlugin.h"
-#include "plugins/PositionPlugin.h"
-#include "plugins/RemoteHardwarePlugin.h"
-#include "plugins/ReplyPlugin.h"
-#include "plugins/RoutingPlugin.h"
-#include "plugins/TextMessagePlugin.h"
+#include "modules/AdminModule.h"
+#include "modules/CannedMessageModule.h"
+#include "modules/ExternalNotificationModule.h"
+#include "modules/NodeInfoModule.h"
+#include "modules/PositionModule.h"
+#include "modules/RemoteHardwareModule.h"
+#include "modules/ReplyModule.h"
+#include "modules/RoutingModule.h"
+#include "modules/TextMessageModule.h"
 #ifndef PORTDUINO
-#include "plugins/Telemetry/Telemetry.h"
+#include "modules/Telemetry/Telemetry.h"
 #endif
 #ifndef NO_ESP32
-#include "plugins/esp32/RangeTestPlugin.h"
-#include "plugins/esp32/SerialPlugin.h"
-#include "plugins/esp32/StoreForwardPlugin.h"
+#include "modules/esp32/RangeTestPlugin.h"
+#include "modules/esp32/SerialPlugin.h"
+#include "modules/esp32/StoreForwardPlugin.h"
 #endif
 
 /**
diff --git a/src/plugins/Plugins.h b/src/modules/Modules.h
similarity index 100%
rename from src/plugins/Plugins.h
rename to src/modules/Modules.h
diff --git a/src/plugins/NodeInfoPlugin.cpp b/src/modules/NodeInfoModule.cpp
similarity index 98%
rename from src/plugins/NodeInfoPlugin.cpp
rename to src/modules/NodeInfoModule.cpp
index 51303ac57..83056d268 100644
--- a/src/plugins/NodeInfoPlugin.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "NodeInfoPlugin.h"
+#include "NodeInfoModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/plugins/NodeInfoPlugin.h b/src/modules/NodeInfoModule.h
similarity index 100%
rename from src/plugins/NodeInfoPlugin.h
rename to src/modules/NodeInfoModule.h
diff --git a/src/plugins/PositionPlugin.cpp b/src/modules/PositionModule.cpp
similarity index 99%
rename from src/plugins/PositionPlugin.cpp
rename to src/modules/PositionModule.cpp
index 3f1355cbe..0f52d1865 100644
--- a/src/plugins/PositionPlugin.cpp
+++ b/src/modules/PositionModule.cpp
@@ -1,4 +1,4 @@
-#include "PositionPlugin.h"
+#include "PositionModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/plugins/PositionPlugin.h b/src/modules/PositionModule.h
similarity index 100%
rename from src/plugins/PositionPlugin.h
rename to src/modules/PositionModule.h
diff --git a/src/plugins/RemoteHardwarePlugin.cpp b/src/modules/RemoteHardwareModule.cpp
similarity index 99%
rename from src/plugins/RemoteHardwarePlugin.cpp
rename to src/modules/RemoteHardwareModule.cpp
index 9da7ae218..1068e9cca 100644
--- a/src/plugins/RemoteHardwarePlugin.cpp
+++ b/src/modules/RemoteHardwareModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "RemoteHardwarePlugin.h"
+#include "RemoteHardwareModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
diff --git a/src/plugins/RemoteHardwarePlugin.h b/src/modules/RemoteHardwareModule.h
similarity index 100%
rename from src/plugins/RemoteHardwarePlugin.h
rename to src/modules/RemoteHardwareModule.h
diff --git a/src/plugins/ReplyPlugin.cpp b/src/modules/ReplyModule.cpp
similarity index 96%
rename from src/plugins/ReplyPlugin.cpp
rename to src/modules/ReplyModule.cpp
index b0aa08673..d6f5dd10d 100644
--- a/src/plugins/ReplyPlugin.cpp
+++ b/src/modules/ReplyModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "ReplyPlugin.h"
+#include "ReplyModule.h"
 #include "MeshService.h"
 #include "main.h"
 
diff --git a/src/plugins/ReplyPlugin.h b/src/modules/ReplyModule.h
similarity index 100%
rename from src/plugins/ReplyPlugin.h
rename to src/modules/ReplyModule.h
diff --git a/src/plugins/RoutingPlugin.cpp b/src/modules/RoutingModule.cpp
similarity index 98%
rename from src/plugins/RoutingPlugin.cpp
rename to src/modules/RoutingModule.cpp
index 82b0403fe..e762a8a03 100644
--- a/src/plugins/RoutingPlugin.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "RoutingPlugin.h"
+#include "RoutingModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
diff --git a/src/plugins/RoutingPlugin.h b/src/modules/RoutingModule.h
similarity index 100%
rename from src/plugins/RoutingPlugin.h
rename to src/modules/RoutingModule.h
diff --git a/src/plugins/Telemetry/Sensor/BME280Sensor.cpp b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
similarity index 100%
rename from src/plugins/Telemetry/Sensor/BME280Sensor.cpp
rename to src/modules/Telemetry/Sensor/BME280Sensor.cpp
diff --git a/src/plugins/Telemetry/Sensor/BME280Sensor.h b/src/modules/Telemetry/Sensor/BME280Sensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/BME280Sensor.h
rename to src/modules/Telemetry/Sensor/BME280Sensor.h
diff --git a/src/plugins/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
similarity index 100%
rename from src/plugins/Telemetry/Sensor/BME680Sensor.cpp
rename to src/modules/Telemetry/Sensor/BME680Sensor.cpp
diff --git a/src/plugins/Telemetry/Sensor/BME680Sensor.h b/src/modules/Telemetry/Sensor/BME680Sensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/BME680Sensor.h
rename to src/modules/Telemetry/Sensor/BME680Sensor.h
diff --git a/src/plugins/Telemetry/Sensor/DHTSensor.cpp b/src/modules/Telemetry/Sensor/DHTSensor.cpp
similarity index 100%
rename from src/plugins/Telemetry/Sensor/DHTSensor.cpp
rename to src/modules/Telemetry/Sensor/DHTSensor.cpp
diff --git a/src/plugins/Telemetry/Sensor/DHTSensor.h b/src/modules/Telemetry/Sensor/DHTSensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/DHTSensor.h
rename to src/modules/Telemetry/Sensor/DHTSensor.h
diff --git a/src/plugins/Telemetry/Sensor/DallasSensor.cpp b/src/modules/Telemetry/Sensor/DallasSensor.cpp
similarity index 100%
rename from src/plugins/Telemetry/Sensor/DallasSensor.cpp
rename to src/modules/Telemetry/Sensor/DallasSensor.cpp
diff --git a/src/plugins/Telemetry/Sensor/DallasSensor.h b/src/modules/Telemetry/Sensor/DallasSensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/DallasSensor.h
rename to src/modules/Telemetry/Sensor/DallasSensor.h
diff --git a/src/plugins/Telemetry/Sensor/MCP9808Sensor.cpp b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
similarity index 100%
rename from src/plugins/Telemetry/Sensor/MCP9808Sensor.cpp
rename to src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
diff --git a/src/plugins/Telemetry/Sensor/MCP9808Sensor.h b/src/modules/Telemetry/Sensor/MCP9808Sensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/MCP9808Sensor.h
rename to src/modules/Telemetry/Sensor/MCP9808Sensor.h
diff --git a/src/plugins/Telemetry/Sensor/TelemetrySensor.h b/src/modules/Telemetry/Sensor/TelemetrySensor.h
similarity index 100%
rename from src/plugins/Telemetry/Sensor/TelemetrySensor.h
rename to src/modules/Telemetry/Sensor/TelemetrySensor.h
diff --git a/src/plugins/Telemetry/Telemetry.cpp b/src/modules/Telemetry/Telemetry.cpp
similarity index 100%
rename from src/plugins/Telemetry/Telemetry.cpp
rename to src/modules/Telemetry/Telemetry.cpp
diff --git a/src/plugins/Telemetry/Telemetry.h b/src/modules/Telemetry/Telemetry.h
similarity index 100%
rename from src/plugins/Telemetry/Telemetry.h
rename to src/modules/Telemetry/Telemetry.h
diff --git a/src/plugins/TextMessagePlugin.cpp b/src/modules/TextMessageModule.cpp
similarity index 95%
rename from src/plugins/TextMessagePlugin.cpp
rename to src/modules/TextMessageModule.cpp
index c2b1f08b2..bd6aea770 100644
--- a/src/plugins/TextMessagePlugin.cpp
+++ b/src/modules/TextMessageModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#include "TextMessagePlugin.h"
+#include "TextMessageModule.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 
diff --git a/src/plugins/TextMessagePlugin.h b/src/modules/TextMessageModule.h
similarity index 100%
rename from src/plugins/TextMessagePlugin.h
rename to src/modules/TextMessageModule.h
diff --git a/src/plugins/esp32/RangeTestPlugin.cpp b/src/modules/esp32/RangeTestPlugin.cpp
similarity index 100%
rename from src/plugins/esp32/RangeTestPlugin.cpp
rename to src/modules/esp32/RangeTestPlugin.cpp
diff --git a/src/plugins/esp32/RangeTestPlugin.h b/src/modules/esp32/RangeTestPlugin.h
similarity index 100%
rename from src/plugins/esp32/RangeTestPlugin.h
rename to src/modules/esp32/RangeTestPlugin.h
diff --git a/src/plugins/esp32/SerialPlugin.cpp b/src/modules/esp32/SerialPlugin.cpp
similarity index 100%
rename from src/plugins/esp32/SerialPlugin.cpp
rename to src/modules/esp32/SerialPlugin.cpp
diff --git a/src/plugins/esp32/SerialPlugin.h b/src/modules/esp32/SerialPlugin.h
similarity index 100%
rename from src/plugins/esp32/SerialPlugin.h
rename to src/modules/esp32/SerialPlugin.h
diff --git a/src/plugins/esp32/StoreForwardPlugin.cpp b/src/modules/esp32/StoreForwardPlugin.cpp
similarity index 99%
rename from src/plugins/esp32/StoreForwardPlugin.cpp
rename to src/modules/esp32/StoreForwardPlugin.cpp
index f556359f2..f789d5948 100644
--- a/src/plugins/esp32/StoreForwardPlugin.cpp
+++ b/src/modules/esp32/StoreForwardPlugin.cpp
@@ -7,7 +7,7 @@
 #include "configuration.h"
 #include "mesh-pb-constants.h"
 #include "mesh/generated/storeforward.pb.h"
-#include "plugins/PluginDev.h"
+#include "modules/ModuleDev.h"
 #include <Arduino.h>
 #include <iterator>
 #include <map>
diff --git a/src/plugins/esp32/StoreForwardPlugin.h b/src/modules/esp32/StoreForwardPlugin.h
similarity index 100%
rename from src/plugins/esp32/StoreForwardPlugin.h
rename to src/modules/esp32/StoreForwardPlugin.h
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 3bb12d48e..dd37c3bc9 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -7,8 +7,8 @@ src_filter =
   -<nimble/> 
   -<nrf52/> 
   -<mesh/http/> 
-  -<plugins/esp32>
-  -<plugins/Telemetry>
+  -<modules/esp32>
+  -<modules/Telemetry>
   +<../variants/portduino>
 build_flags = ${arduino_base.build_flags} -O0 -I variants/portduino
 framework = arduino
@@ -26,8 +26,8 @@ src_filter =
   -<nimble/> 
   -<nrf52/> 
   -<mesh/http/> 
-  -<plugins/esp32>
-  -<plugins/Telemetry>
+  -<modules/esp32>
+  -<modules/Telemetry>
   +<../variants/portduino>
 build_flags = ${arduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 framework = arduino