diff --git a/Sub-GHz/Ceiling Fans/Generic_Ceiling_Fan_Remote.sub b/Sub-GHz/Ceiling_Fans/Generic_Ceiling_Fan_Remote.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Generic_Ceiling_Fan_Remote.sub
rename to Sub-GHz/Ceiling_Fans/Generic_Ceiling_Fan_Remote.sub
diff --git a/Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/0_Fan_off.sub b/Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/0_Fan_off.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/0_Fan_off.sub
rename to Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/0_Fan_off.sub
diff --git a/Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/1_Fan_low.sub b/Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/1_Fan_low.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/1_Fan_low.sub
rename to Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/1_Fan_low.sub
diff --git a/Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/2_Fan_med.sub b/Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/2_Fan_med.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/2_Fan_med.sub
rename to Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/2_Fan_med.sub
diff --git a/Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/3_Fan_hi.sub b/Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/3_Fan_hi.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/3_Fan_hi.sub
rename to Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/3_Fan_hi.sub
diff --git a/Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/Light Toggle.sub b/Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/Light_Toggle.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Hampton Bay Ceiling Fan/Light Toggle.sub
rename to Sub-GHz/Ceiling_Fans/Hampton_Bay_Ceiling_Fan/Light_Toggle.sub
diff --git a/Sub-GHz/Ceiling Fans/Mink aire/Mink Aire code set 0_Fan High.sub b/Sub-GHz/Ceiling_Fans/Mink_aire/Mink_Aire_code_set_0_Fan_High.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Mink aire/Mink Aire code set 0_Fan High.sub
rename to Sub-GHz/Ceiling_Fans/Mink_aire/Mink_Aire_code_set_0_Fan_High.sub
diff --git a/Sub-GHz/Ceiling Fans/Mink aire/Mink Aire code set 0_Fan_Off.sub b/Sub-GHz/Ceiling_Fans/Mink_aire/Mink_Aire_code_set_0_Fan_Off.sub
similarity index 100%
rename from Sub-GHz/Ceiling Fans/Mink aire/Mink Aire code set 0_Fan_Off.sub
rename to Sub-GHz/Ceiling_Fans/Mink_aire/Mink_Aire_code_set_0_Fan_Off.sub
diff --git a/Sub-GHz/Doorbells/Sonnette_Maison_Doorbell .sub b/Sub-GHz/Doorbells/Sonnette_Maison_Doorbell.sub
similarity index 100%
rename from Sub-GHz/Doorbells/Sonnette_Maison_Doorbell .sub
rename to Sub-GHz/Doorbells/Sonnette_Maison_Doorbell.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/893LM_7359_1.sub b/Sub-GHz/Garages/Security_2.0/7359/893LM_7359_1.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/893LM_7359_1.sub
rename to Sub-GHz/Garages/Security_2.0/7359/893LM_7359_1.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/893LM_7359_2.sub b/Sub-GHz/Garages/Security_2.0/7359/893LM_7359_2.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/893LM_7359_2.sub
rename to Sub-GHz/Garages/Security_2.0/7359/893LM_7359_2.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/893LM_7539_3.sub b/Sub-GHz/Garages/Security_2.0/7359/893LM_7539_3.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/893LM_7539_3.sub
rename to Sub-GHz/Garages/Security_2.0/7359/893LM_7539_3.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/Raw/891LM_7359_raw.sub b/Sub-GHz/Garages/Security_2.0/7359/Raw/891LM_7359_raw.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/Raw/891LM_7359_raw.sub
rename to Sub-GHz/Garages/Security_2.0/7359/Raw/891LM_7359_raw.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.1.sub b/Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.1.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.1.sub
rename to Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.1.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.2.sub b/Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.2.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.2.sub
rename to Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.2.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.3.sub b/Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.3.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_r_1.3.sub
rename to Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_r_1.3.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_raw2.sub b/Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_raw2.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7359/Raw/893LM_7359_raw2.sub
rename to Sub-GHz/Garages/Security_2.0/7359/Raw/893LM_7359_raw2.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7922/Raw/2668A_315.sub b/Sub-GHz/Garages/Security_2.0/7922/Raw/2668A_315.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7922/Raw/2668A_315.sub
rename to Sub-GHz/Garages/Security_2.0/7922/Raw/2668A_315.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7964/893MAX_7964.sub b/Sub-GHz/Garages/Security_2.0/7964/893MAX_7964.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7964/893MAX_7964.sub
rename to Sub-GHz/Garages/Security_2.0/7964/893MAX_7964.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/7964/raw/893MAX_7964_raw.sub b/Sub-GHz/Garages/Security_2.0/7964/raw/893MAX_7964_raw.sub
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/7964/raw/893MAX_7964_raw.sub
rename to Sub-GHz/Garages/Security_2.0/7964/raw/893MAX_7964_raw.sub
diff --git a/Sub-GHz/Garages/Security+ 2.0/ReadMe.md b/Sub-GHz/Garages/Security_2.0/ReadMe.md
similarity index 100%
rename from Sub-GHz/Garages/Security+ 2.0/ReadMe.md
rename to Sub-GHz/Garages/Security_2.0/ReadMe.md
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Brt_down.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Brt_down.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Brt_down.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Brt_down.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Brt_up.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Brt_up.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Brt_up.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Brt_up.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Light.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Light.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Light.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Light.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Mode_down.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Mode_down.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Mode_down.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Mode_down.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Mode_up.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Mode_up.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Mode_up.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Mode_up.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Pwr.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Pwr.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Pwr.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Pwr.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Spd_down.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Spd_down.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Spd_down.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Spd_down.sub
diff --git a/Sub-GHz/LED/RITSEC Neon Light/Spd_up.sub b/Sub-GHz/LED/RITSEC_Neon_Light/Spd_up.sub
similarity index 100%
rename from Sub-GHz/LED/RITSEC Neon Light/Spd_up.sub
rename to Sub-GHz/LED/RITSEC_Neon_Light/Spd_up.sub
diff --git a/Sub-GHz/Restaurant Pagers/BruteForceRest.sub b/Sub-GHz/Restaurant_Pagers/BruteForceRest.sub
similarity index 100%
rename from Sub-GHz/Restaurant Pagers/BruteForceRest.sub
rename to Sub-GHz/Restaurant_Pagers/BruteForceRest.sub
diff --git a/Sub-GHz/Restaurant Pagers/LICENSE b/Sub-GHz/Restaurant_Pagers/LICENSE
similarity index 100%
rename from Sub-GHz/Restaurant Pagers/LICENSE
rename to Sub-GHz/Restaurant_Pagers/LICENSE
diff --git a/Sub-GHz/Restaurant Pagers/ReadMe.md b/Sub-GHz/Restaurant_Pagers/ReadMe.md
similarity index 100%
rename from Sub-GHz/Restaurant Pagers/ReadMe.md
rename to Sub-GHz/Restaurant_Pagers/ReadMe.md
diff --git a/wetox scripts/ReadMe.md b/wetox_scripts/ReadMe.md
similarity index 100%
rename from wetox scripts/ReadMe.md
rename to wetox_scripts/ReadMe.md
diff --git a/wetox scripts/changefreq.py b/wetox_scripts/changefreq.py
similarity index 100%
rename from wetox scripts/changefreq.py
rename to wetox_scripts/changefreq.py
diff --git a/wetox scripts/draw_subghz.py b/wetox_scripts/draw_subghz.py
similarity index 100%
rename from wetox scripts/draw_subghz.py
rename to wetox_scripts/draw_subghz.py
diff --git a/wetox scripts/json_to_nfc.py b/wetox_scripts/json_to_nfc.py
similarity index 100%
rename from wetox scripts/json_to_nfc.py
rename to wetox_scripts/json_to_nfc.py