diff --git "a/Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.0/README.md" b/Applications/Security/template_devline_windows_monitoring_cctv/5.0/README.md
similarity index 100%
rename from "Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.0/README.md"
rename to Applications/Security/template_devline_windows_monitoring_cctv/5.0/README.md
diff --git "a/Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.0/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.xml" "b/Applications/Security/template_devline_windows_monitoring_cctv/5.0/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.xml"
similarity index 100%
rename from "Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.0/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.xml"
rename to "Applications/Security/template_devline_windows_monitoring_cctv/5.0/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.xml"
diff --git "a/Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.4/README.md" b/Applications/Security/template_devline_windows_monitoring_cctv/5.4/README.md
similarity index 100%
rename from "Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.4/README.md"
rename to Applications/Security/template_devline_windows_monitoring_cctv/5.4/README.md
diff --git "a/Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.4/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.yaml" "b/Applications/Security/template_devline_windows_monitoring_cctv/5.4/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.yaml"
similarity index 100%
rename from "Applications/Security/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200/5.4/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.yaml"
rename to "Applications/Security/template_devline_windows_monitoring_cctv/5.4/template_devline._windows._\320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\270\320\275\320\263_\320\275\320\260\320\273\320\270\321\207\320\270\321\217_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\271_\321\201_\320\272\320\260\320\274\320\265\321\200.yaml"
diff --git "a/Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.0/README.md" b/Network_Appliances/template_big_ip_f5-snmp/5.0/README.md
similarity index 100%
rename from "Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.0/README.md"
rename to Network_Appliances/template_big_ip_f5-snmp/5.0/README.md
diff --git "a/Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.0/template_big_ip_f5-snmp-portugu\303\252s-br.xml" "b/Network_Appliances/template_big_ip_f5-snmp/5.0/template_big_ip_f5-snmp-portugu\303\252s-br.xml"
similarity index 100%
rename from "Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.0/template_big_ip_f5-snmp-portugu\303\252s-br.xml"
rename to "Network_Appliances/template_big_ip_f5-snmp/5.0/template_big_ip_f5-snmp-portugu\303\252s-br.xml"
diff --git "a/Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.4/README.md" b/Network_Appliances/template_big_ip_f5-snmp/5.4/README.md
similarity index 100%
rename from "Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.4/README.md"
rename to Network_Appliances/template_big_ip_f5-snmp/5.4/README.md
diff --git "a/Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.4/template_big_ip_f5-snmp-portugu\303\252s-br.yaml" "b/Network_Appliances/template_big_ip_f5-snmp/5.4/template_big_ip_f5-snmp-portugu\303\252s-br.yaml"
similarity index 100%
rename from "Network_Appliances/template_big_ip_f5-snmp-portugu\303\252s-br/5.4/template_big_ip_f5-snmp-portugu\303\252s-br.yaml"
rename to "Network_Appliances/template_big_ip_f5-snmp/5.4/template_big_ip_f5-snmp-portugu\303\252s-br.yaml"
diff --git "a/Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.0/README.md" b/Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.0/README.md
similarity index 100%
rename from "Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.0/README.md"
rename to Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.0/README.md
diff --git "a/Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.0/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.xml" "b/Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.0/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.xml"
similarity index 100%
rename from "Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.0/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.xml"
rename to "Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.0/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.xml"
diff --git "a/Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.4/README.md" b/Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.4/README.md
similarity index 100%
rename from "Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.4/README.md"
rename to Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.4/README.md
diff --git "a/Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.4/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.yaml" "b/Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.4/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.yaml"
similarity index 100%
rename from "Network_Devices/Mikrotik/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211/5.4/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.yaml"
rename to "Network_Devices/Mikrotik/template_mikrotik_routerboard_general_rb_device_only/5.4/template_mikrotik_routerboard\351\200\232\347\224\250\346\250\241\346\235\277\357\274\210\344\273\205\351\231\220\344\272\216rb\350\256\276\345\244\207\357\274\211.yaml"
diff --git "a/Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.0/README.md" b/Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.0/README.md
similarity index 100%
rename from "Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.0/README.md"
rename to Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.0/README.md
diff --git "a/Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.0/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).xml" "b/Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.0/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).xml"
similarity index 100%
rename from "Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.0/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).xml"
rename to "Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.0/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).xml"
diff --git "a/Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.4/README.md" b/Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.4/README.md
similarity index 100%
rename from "Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.4/README.md"
rename to Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.4/README.md
diff --git "a/Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.4/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).yaml" "b/Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.4/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).yaml"
similarity index 100%
rename from "Network_Devices/Ubiquiti/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes)/5.4/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).yaml"
rename to "Network_Devices/Ubiquiti/template_ubiquiti_airmax_stations_clients/5.4/template_ubiquiti_airmax_esta\303\247\303\265es_(clientes).yaml"
diff --git "a/Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.0/README.md" b/Operating_Systems/template_checks_windows_activation/5.0/README.md
similarity index 100%
rename from "Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.0/README.md"
rename to Operating_Systems/template_checks_windows_activation/5.0/README.md
diff --git "a/Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.0/template_ativa\303\247\303\243o_do_windows.xml" "b/Operating_Systems/template_checks_windows_activation/5.0/template_ativa\303\247\303\243o_do_windows.xml"
similarity index 100%
rename from "Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.0/template_ativa\303\247\303\243o_do_windows.xml"
rename to "Operating_Systems/template_checks_windows_activation/5.0/template_ativa\303\247\303\243o_do_windows.xml"
diff --git "a/Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.4/README.md" b/Operating_Systems/template_checks_windows_activation/5.4/README.md
similarity index 100%
rename from "Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.4/README.md"
rename to Operating_Systems/template_checks_windows_activation/5.4/README.md
diff --git "a/Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.4/template_ativa\303\247\303\243o_do_windows.yaml" "b/Operating_Systems/template_checks_windows_activation/5.4/template_ativa\303\247\303\243o_do_windows.yaml"
similarity index 100%
rename from "Operating_Systems/template_ativa\303\247\303\243o_do_windows/5.4/template_ativa\303\247\303\243o_do_windows.yaml"
rename to "Operating_Systems/template_checks_windows_activation/5.4/template_ativa\303\247\303\243o_do_windows.yaml"
diff --git "a/Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.0/README.md" b/Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.0/README.md
similarity index 100%
rename from "Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.0/README.md"
rename to Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.0/README.md
diff --git "a/Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.0/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.xml" "b/Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.0/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.xml"
similarity index 100%
rename from "Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.0/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.xml"
rename to "Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.0/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.xml"
diff --git "a/Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.4/README.md" b/Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.4/README.md
similarity index 100%
rename from "Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.4/README.md"
rename to Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.4/README.md
diff --git "a/Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.4/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.yaml" "b/Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.4/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.yaml"
similarity index 100%
rename from "Power_(UPS)/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2/5.4/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.yaml"
rename to "Power_(UPS)/template_net_volt_full_power_380_1u_snmpv2/5.4/template_net_volt_full_power_380_1u_gerenci\303\241vel_snmpv2.yaml"
diff --git "a/Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.0/README.md" b/Telephony/template_snmp_interfaces_com/5.0/README.md
similarity index 100%
rename from "Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.0/README.md"
rename to Telephony/template_snmp_interfaces_com/5.0/README.md
diff --git "a/Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.0/template_snmp_interfaces_com_descri\303\247\303\243o.xml" "b/Telephony/template_snmp_interfaces_com/5.0/template_snmp_interfaces_com_descri\303\247\303\243o.xml"
similarity index 100%
rename from "Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.0/template_snmp_interfaces_com_descri\303\247\303\243o.xml"
rename to "Telephony/template_snmp_interfaces_com/5.0/template_snmp_interfaces_com_descri\303\247\303\243o.xml"
diff --git "a/Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.4/README.md" b/Telephony/template_snmp_interfaces_com/5.4/README.md
similarity index 100%
rename from "Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.4/README.md"
rename to Telephony/template_snmp_interfaces_com/5.4/README.md
diff --git "a/Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.4/template_snmp_interfaces_com_descri\303\247\303\243o.yaml" "b/Telephony/template_snmp_interfaces_com/5.4/template_snmp_interfaces_com_descri\303\247\303\243o.yaml"
similarity index 100%
rename from "Telephony/template_snmp_interfaces_com_descri\303\247\303\243o/5.4/template_snmp_interfaces_com_descri\303\247\303\243o.yaml"
rename to "Telephony/template_snmp_interfaces_com/5.4/template_snmp_interfaces_com_descri\303\247\303\243o.yaml"