diff --git a/pio/espupload.py b/pio-tools/espupload.py
similarity index 100%
rename from pio/espupload.py
rename to pio-tools/espupload.py
diff --git a/pio/gzip-firmware.py b/pio-tools/gzip-firmware.py
similarity index 100%
rename from pio/gzip-firmware.py
rename to pio-tools/gzip-firmware.py
diff --git a/pio/http-uploader.py b/pio-tools/http-uploader.py
similarity index 73%
rename from pio/http-uploader.py
rename to pio-tools/http-uploader.py
index 88d5a23ce..f110e7acd 100644
--- a/pio/http-uploader.py
+++ b/pio-tools/http-uploader.py
@@ -3,11 +3,11 @@ import os
 
 # pio < 4.0.0
 # from base64 import b64decode
-# env.Replace(UPLOADER="pio\espupload.py")
+# env.Replace(UPLOADER="pio-tools\espupload.py")
 # env.Replace(UPLOADERFLAGS="")
 # env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES")
 
 # pio >= 4.0.0
-env.Replace(UPLOADER=os.path.join("pio", "espupload.py"))
+env.Replace(UPLOADER=os.path.join("pio-tools", "espupload.py"))
 env.Replace(UPLOADERFLAGS="")
 env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES")
diff --git a/pio/name-firmware.py b/pio-tools/name-firmware.py
similarity index 100%
rename from pio/name-firmware.py
rename to pio-tools/name-firmware.py
diff --git a/pio/obj-dump.py b/pio-tools/obj-dump.py
similarity index 100%
rename from pio/obj-dump.py
rename to pio-tools/obj-dump.py
diff --git a/pio/override_copy.py b/pio-tools/override_copy.py
similarity index 100%
rename from pio/override_copy.py
rename to pio-tools/override_copy.py
diff --git a/pio/sftp-uploader.py b/pio-tools/sftp-uploader.py
similarity index 100%
rename from pio/sftp-uploader.py
rename to pio-tools/sftp-uploader.py
diff --git a/pio/strip-floats.py b/pio-tools/strip-floats.py
similarity index 100%
rename from pio/strip-floats.py
rename to pio-tools/strip-floats.py
diff --git a/platformio.ini b/platformio.ini
index 14034a448..77ac348d3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -93,10 +93,10 @@ lib_extra_dirs              =
                               lib/lib_div
 
 [scripts_defaults]
-extra_scripts               = pio/strip-floats.py
-                              pio/name-firmware.py
-                              pio/gzip-firmware.py
-                              pio/override_copy.py
+extra_scripts               = pio-tools/strip-floats.py
+                              pio-tools/name-firmware.py
+                              pio-tools/gzip-firmware.py
+                              pio-tools/override_copy.py
 
 [esp_defaults]
 ; *** remove undesired all warnings
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 888c87942..164f74464 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -58,7 +58,7 @@ build_flags                 = ${core.build_flags}
 upload_port                 = COM5
 
 extra_scripts               = ${scripts_defaults.extra_scripts}
-;                              pio/obj-dump.py
+;                              pio-tools/obj-dump.py
 
 lib_extra_dirs              = ${library.lib_extra_dirs}