diff --git a/code/platformio.ini b/code/platformio.ini
index e7b1b7e0..b56498b6 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -70,6 +70,8 @@ lib_deps =
 lib_ignore =
 extra_scripts = extra_scripts.py
 
+# ------------------------------------------------------------------------------
+# ESPURNA CORE BUILDS
 # ------------------------------------------------------------------------------
 
 [env:espurna-core-1MB]
@@ -94,6 +96,71 @@ build_flags = ${common.build_flags} -DESPURNA_CORE
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
+# ------------------------------------------------------------------------------
+# GENERIC OTA ENVIRONMENTS
+# ------------------------------------------------------------------------------
+
+[env:esp8266-1m-ota]
+platform = ${common.platform}
+framework = arduino
+board = esp01_1m
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m} -D${env.ESPURNA_BOARD}
+upload_speed = 115200
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
+extra_scripts = ${common.extra_scripts}
+
+[env:esp8266-4m-ota]
+platform = ${common.platform}
+framework = arduino
+board = esp12e
+board_flash_mode = dout
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -D${env.ESPURNA_BOARD}
+upload_speed = 115200
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
+extra_scripts = ${common.extra_scripts}
+
+# ------------------------------------------------------------------------------
+# SPECIAL BUILDS - DO. NOT. USE. ever ---
+# ------------------------------------------------------------------------------
+[env:travis01]
+platform = ${common.platform}
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DTRAVIS01
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:travis02]
+platform = ${common.platform}
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DTRAVIS02
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+[env:travis03]
+platform = espressif8266@1.6.0
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DTRAVIS03 -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
+monitor_baud = 115200
+extra_scripts = ${common.extra_scripts}
+
+# ------------------------------------------------------------------------------
+# DEVELOPMENT BOARDS
 # ------------------------------------------------------------------------------
 
 [env:wemos-d1mini-relayshield]
@@ -165,6 +232,8 @@ upload_flags = ${common.upload_flags}
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
+# ------------------------------------------------------------------------------
+# SPECIFIC BOARDS
 # ------------------------------------------------------------------------------
 
 [env:tinkerman-espurna-h06]
@@ -1876,66 +1945,3 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
-
-# ------------------------------------------------------------------------------
-# GENERIC OTA ENVIRONMENTS
-# ------------------------------------------------------------------------------
-
-[env:esp8266-1m-ota]
-platform = ${common.platform}
-framework = arduino
-board = esp01_1m
-board_flash_mode = dout
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m} -D${env.ESPURNA_BOARD}
-upload_speed = 115200
-upload_port = "${env.ESPURNA_IP}"
-upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-extra_scripts = ${common.extra_scripts}
-
-[env:esp8266-4m-ota]
-platform = ${common.platform}
-framework = arduino
-board = esp12e
-board_flash_mode = dout
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags} -D${env.ESPURNA_BOARD}
-upload_speed = 115200
-upload_port = "${env.ESPURNA_IP}"
-upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-extra_scripts = ${common.extra_scripts}
-
-# ------------------------------------------------------------------------------
-# SPECIAL BUILDS - DO. NOT. USE. ever ---
-# ------------------------------------------------------------------------------
-[env:travis01]
-platform = ${common.platform}
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags} -DTRAVIS01
-monitor_baud = 115200
-extra_scripts = ${common.extra_scripts}
-
-[env:travis02]
-platform = ${common.platform}
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags} -DTRAVIS02
-monitor_baud = 115200
-extra_scripts = ${common.extra_scripts}
-
-[env:travis03]
-platform = espressif8266@1.6.0
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags} -DTRAVIS03 -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
-monitor_baud = 115200
-extra_scripts = ${common.extra_scripts}