From 905efdfc34220bb28570f9523c62e188fdaab4da Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Sat, 29 Jun 2019 11:23:41 +0200
Subject: [PATCH] Rename Conf Directories for Tests

---
 .../beta-install-nginx-testing-of-changes.sh  | 19 +++++++-------
 .dev-tools/beta-test-blocker-rate-limiting.sh |  8 +++---
 .dev-tools/beta-test-blocker-whitelist-ips.sh |  8 +++---
 .dev-tools/beta-test-blocker-whitelist.sh     |  8 +++---
 .dev-tools/beta-test-blocker.sh               | 25 +++++++------------
 .../.keep                                     |  0
 .../bots.d}/.keep                             |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../bots.d => beta_conf_files/conf.d}/.keep   |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d}/.keep                             |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d}/.keep                             |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d}/.keep                             |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d}/.keep                             |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d}/.keep                             |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d}/.keep                             |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .dev-tools/install-nginx-1.sh                 | 10 ++++----
 .dev-tools/install-nginx-2.sh                 |  8 +++---
 .dev-tools/test-blocker-rate-limiting.sh      |  8 +++---
 .dev-tools/test-blocker-whitelist-ips.sh      |  8 +++---
 .dev-tools/test-blocker-whitelist.sh          |  8 +++---
 .dev-tools/test-nginx-2.sh                    | 13 +++++-----
 .../.keep                                     |  0
 .../nginx.conf                                |  0
 .../nginx13.conf                              |  0
 .../conf.d => test1_conf_files}/.keep         |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../bots.d => test2_conf_files}/.keep         |  0
 .../conf.d => test2_conf_files/bots.d}/.keep  |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d}/.keep                             |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 .../.keep                                     |  0
 .../bots.d/.keep                              |  0
 .../bots.d/bad-referrer-words.conf            |  0
 .../bots.d/blacklist-domains.conf             |  0
 .../bots.d/blacklist-ips.conf                 |  0
 .../bots.d/blacklist-user-agents.conf         |  0
 .../bots.d/blockbots.conf                     |  0
 .../bots.d/custom-bad-referrers.conf          |  0
 .../bots.d/ddos.conf                          |  0
 .../bots.d/whitelist-domains.conf             |  0
 .../bots.d/whitelist-ips.conf                 |  0
 .../conf.d/.keep                              |  0
 .../conf.d/botblocker-nginx-settings.conf     |  0
 .../conf.d/globalblacklist.conf               |  0
 .../default.vhost                             |  0
 .../nginx.conf                                |  0
 190 files changed, 57 insertions(+), 66 deletions(-)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files}/.keep (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files/bots.d}/.keep (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test1/bots.d => beta_conf_files/conf.d}/.keep (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/default.vhost (100%)
 rename .dev-tools/{_conf_files_test1 => beta_conf_files}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_test4 => beta_conf_files_ip_whitelist}/.keep (100%)
 rename .dev-tools/{_conf_files_test1/conf.d => beta_conf_files_ip_whitelist/bots.d}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ip_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_ip_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ip_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files_ip_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files_ip_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files_ip_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files_ip_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ip_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ip_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test3/bots.d => beta_conf_files_ip_whitelist/conf.d}/.keep (100%)
 rename .dev-tools/{_conf_files_test3 => beta_conf_files_ip_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ip_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_ip_whitelist}/default.vhost (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_ip_whitelist}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_ratelimiting}/.keep (100%)
 rename .dev-tools/{_conf_files_test3/conf.d => beta_conf_files_ratelimiting/bots.d}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ratelimiting}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_test4 => beta_conf_files_ratelimiting}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_test4 => beta_conf_files_ratelimiting}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_test4 => beta_conf_files_ratelimiting}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test4/bots.d => beta_conf_files_ratelimiting/conf.d}/.keep (100%)
 rename .dev-tools/{_conf_files_test4 => beta_conf_files_ratelimiting}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_ratelimiting}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ratelimiting}/default.vhost (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_ratelimiting}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => beta_conf_files_whitelist}/.keep (100%)
 rename .dev-tools/{_conf_files_test4/conf.d => beta_conf_files_whitelist/bots.d}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes/bots.d => beta_conf_files_whitelist/conf.d}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes => beta_conf_files_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => beta_conf_files_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_whitelist}/default.vhost (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => beta_conf_files_whitelist}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_backup_nginxconf}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_backup_nginxconf}/nginx.conf (100%)
 rename .dev-tools/{_nginx_conf_backup => test1_conf_backup_nginxconf}/nginx13.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes/conf.d => test1_conf_files}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files}/bots.d/.keep (100%)
 rename .dev-tools/{_conf_files_test3 => test1_conf_files}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test1_conf_files}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test1_conf_files}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => test1_conf_files}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test1_conf_files}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test1 => test1_conf_files}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files}/conf.d/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_test1 => test1_conf_files}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files}/default.vhost (100%)
 rename .dev-tools/{_nginx_conf_backup => test1_conf_files}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ip_whitelist}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ip_whitelist}/bots.d/.keep (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ip_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ip_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ip_whitelist}/conf.d/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ip_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ip_whitelist}/default.vhost (100%)
 rename .dev-tools/{_conf_files_test4 => test1_conf_files_ip_whitelist}/nginx.conf (100%)
 rename .dev-tools/{_nginx_conf_backup => test1_conf_files_ratelimiting}/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ratelimiting}/bots.d/.keep (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ratelimiting}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ratelimiting => test1_conf_files_ratelimiting}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ratelimiting}/bots.d/ddos.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ratelimiting}/conf.d/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes_whitelist => test1_conf_files_ratelimiting}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_ratelimiting}/default.vhost (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_ratelimiting}/nginx.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/.keep (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/bots.d/.keep (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/conf.d/.keep (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test1_conf_files_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test1_conf_files_whitelist}/default.vhost (100%)
 rename .dev-tools/{conf_files_ratelimiting => test1_conf_files_whitelist}/nginx.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting/bots.d => test2_conf_files}/.keep (100%)
 rename .dev-tools/{conf_files_ratelimiting/conf.d => test2_conf_files/bots.d}/.keep (100%)
 rename .dev-tools/{_conf_files_test4 => test2_conf_files}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test2_conf_files}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test2_conf_files}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => test2_conf_files}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test2_conf_files}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{conf_files_ip_whitelist => test2_conf_files}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test2_conf_files}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test2_conf_files}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{conf_files_test2 => test2_conf_files}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{conf_files_test2 => test2_conf_files/conf.d}/.keep (100%)
 rename .dev-tools/{conf_files_ratelimiting => test2_conf_files}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{conf_files_test2 => test2_conf_files}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{conf_files_test2 => test2_conf_files}/default.vhost (100%)
 rename .dev-tools/{conf_files_test2 => test2_conf_files}/nginx.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test3_conf_files}/.keep (100%)
 rename .dev-tools/{conf_files_test2 => test3_conf_files}/bots.d/.keep (100%)
 rename .dev-tools/{_conf_files_testing_changes => test3_conf_files}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test3_conf_files}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => test3_conf_files}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes_ip_whitelist => test3_conf_files}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{conf_files_test2 => test3_conf_files}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{conf_files_ratelimiting => test3_conf_files}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{conf_files_test2 => test3_conf_files}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_testing_changes => test3_conf_files}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test3_conf_files}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{conf_files_test2 => test3_conf_files}/conf.d/.keep (100%)
 rename .dev-tools/{conf_files_test2 => test3_conf_files}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test3_conf_files}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_test3 => test3_conf_files}/default.vhost (100%)
 rename .dev-tools/{_conf_files_test3 => test3_conf_files}/nginx.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/.keep (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/bots.d/.keep (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/bots.d/ddos.conf (100%)
 rename .dev-tools/{conf_files_test2 => test4_conf_files}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test4_conf_files}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/conf.d/.keep (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test4_conf_files}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_test4 => test4_conf_files}/default.vhost (100%)
 rename .dev-tools/{conf_files_whitelist => test4_conf_files}/nginx.conf (100%)

diff --git a/.dev-tools/beta-install-nginx-testing-of-changes.sh b/.dev-tools/beta-install-nginx-testing-of-changes.sh
index 2af76e247..412f742b4 100755
--- a/.dev-tools/beta-install-nginx-testing-of-changes.sh
+++ b/.dev-tools/beta-install-nginx-testing-of-changes.sh
@@ -60,10 +60,10 @@ defaultcolor=$(tput setaf default)
 # ---------
 
 reloadNginX () {
+printf "\n"
 echo "${bold}${green}---------------"
 echo "${bold}${green}Reloading Nginx"
 echo "${bold}${green}---------------"
-printf "\n\n"
 sudo nginx -t && sudo nginx -s reload
 }
 
@@ -71,20 +71,19 @@ waitforReload () {
 echo "${bold}${yellow}-----------------------------------------------------------------------"
 echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
 echo "${bold}${yellow}-----------------------------------------------------------------------"
-printf "\n\n"
+printf "\n"
 sleep 10s
 }
 
 backupConfFiles () {
+echo "${bold}${green}-------------------------------------------------------"
+echo "${bold}${green}Backup all conf files and folders used during this test"
+echo "${bold}${green}-------------------------------------------------------"
 printf "\n"
-echo "${bold}${green}------------------------------------------------------------"
-echo "${bold}${green}Make Backup all conf files and folders used during this test"
-echo "${bold}${green}------------------------------------------------------------"
-printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files/nginx.conf
 }
 
 resetNginx () {
diff --git a/.dev-tools/beta-test-blocker-rate-limiting.sh b/.dev-tools/beta-test-blocker-rate-limiting.sh
index 7bc253ab1..183e8c76c 100755
--- a/.dev-tools/beta-test-blocker-rate-limiting.sh
+++ b/.dev-tools/beta-test-blocker-rate-limiting.sh
@@ -115,10 +115,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ratelimiting/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ratelimiting/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ratelimiting/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ratelimiting/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ratelimiting/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ratelimiting/nginx.conf
 }
 
 # -----------
diff --git a/.dev-tools/beta-test-blocker-whitelist-ips.sh b/.dev-tools/beta-test-blocker-whitelist-ips.sh
index b3b86ddfb..373be5cbe 100755
--- a/.dev-tools/beta-test-blocker-whitelist-ips.sh
+++ b/.dev-tools/beta-test-blocker-whitelist-ips.sh
@@ -99,10 +99,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ip_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_ip_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ip_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ip_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ip_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_ip_whitelist/nginx.conf
 }
 
 blacklistOwnIP () {
diff --git a/.dev-tools/beta-test-blocker-whitelist.sh b/.dev-tools/beta-test-blocker-whitelist.sh
index d87d070c4..635592341 100755
--- a/.dev-tools/beta-test-blocker-whitelist.sh
+++ b/.dev-tools/beta-test-blocker-whitelist.sh
@@ -239,10 +239,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/beta_conf_files_whitelist/nginx.conf
 }
 
 # -----------
diff --git a/.dev-tools/beta-test-blocker.sh b/.dev-tools/beta-test-blocker.sh
index fb66bd684..5bbeff737 100755
--- a/.dev-tools/beta-test-blocker.sh
+++ b/.dev-tools/beta-test-blocker.sh
@@ -61,10 +61,10 @@ defaultcolor=$(tput setaf default)
 
 
 reloadNginX () {
+printf "\n"
 echo "${bold}${green}---------------"
 echo "${bold}${green}Reloading Nginx"
 echo "${bold}${green}---------------"
-printf "\n\n"
 sudo nginx -t && sudo nginx -s reload
 }
 
@@ -72,7 +72,7 @@ waitforReload () {
 echo "${bold}${yellow}-----------------------------------------------------------------------"
 echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
 echo "${bold}${yellow}-----------------------------------------------------------------------"
-printf "\n\n"
+printf "\n"
 sleep 10s
 }
 
@@ -217,11 +217,10 @@ shuf -n 250 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-user-agents.list > ${TRAVIS
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.tmp > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.list
 sudo rm ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.tmp
 sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.list
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}---------------------------"
 echo "${bold}${magenta}Testing 250 Random Bad Bots"
 echo "${bold}${magenta}---------------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test.list
 lines=$(cat ${file})
@@ -238,11 +237,10 @@ IFS=""
 
 testGoodUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/good-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-bots-for-test.list
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}---------------------"
 echo "${bold}${magenta}Testing All Good Bots"
 echo "${bold}${magenta}---------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-bots-for-test.list
 lines=$(cat ${file})
@@ -259,11 +257,10 @@ IFS=""
 
 testAllowedUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/allowed-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/allowed-bots-for-test.list
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}------------------------"
 echo "${bold}${magenta}Testing All Allowed Bots"
 echo "${bold}${magenta}------------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/allowed-bots-for-test.list
 lines=$(cat ${file})
@@ -280,11 +277,10 @@ IFS=""
 
 testLimitedUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/limited-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/limited-bots-for-test.list
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}------------------------"
 echo "${bold}${magenta}Testing All Limited Bots"
 echo "${bold}${magenta}------------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/limited-bots-for-test.list
 lines=$(cat ${file})
@@ -302,11 +298,10 @@ IFS=""
 testRandomReferrers () {
 shuf -n 1000 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-referrers.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test.list
 sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test.list
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}---------------------------------"
 echo "${bold}${magenta}Testing 1000 Random Bad Referrers"
 echo "${bold}${magenta}---------------------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test.list
 lines=$(cat ${file})
@@ -322,11 +317,10 @@ IFS=""
 }
 
 testGoodReferrers () {
-printf "\n\n"
+printf "\n"
 echo "${bold}${magenta}----------------------"
 echo "${bold}${magenta}Testing Good Referrers"
 echo "${bold}${magenta}----------------------"
-printf "\n\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-referrers-for-test.list
 lines=$(cat ${file})
@@ -348,7 +342,7 @@ IFS=""
 echo "${bold}${green}--------------"
 echo "${bold}${green}Tests Starting"
 echo "${bold}${green}--------------"
-printf "\n\n"
+printf "\n"
 
 reloadNginX
 waitforReload
@@ -374,7 +368,6 @@ testLimitedUserAgents
 testRandomReferrers
 testGoodReferrers
 
-printf "\n"
 echo "${bold}${cyan}Tests Completed"
 echo "${bold}${green}All Tests Passed"
 echo "${bold}${magenta}Now We Test Whitelisting and then Release a new build"
diff --git a/.dev-tools/_conf_files_test3/.keep b/.dev-tools/beta_conf_files/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test3/.keep
rename to .dev-tools/beta_conf_files/.keep
diff --git a/.dev-tools/_conf_files_test1/.keep b/.dev-tools/beta_conf_files/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test1/.keep
rename to .dev-tools/beta_conf_files/bots.d/.keep
diff --git a/.dev-tools/_conf_files_test1/bots.d/bad-referrer-words.conf b/.dev-tools/beta_conf_files/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/bad-referrer-words.conf
rename to .dev-tools/beta_conf_files/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/blacklist-domains.conf b/.dev-tools/beta_conf_files/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/blacklist-domains.conf
rename to .dev-tools/beta_conf_files/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/blacklist-ips.conf
rename to .dev-tools/beta_conf_files/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/blacklist-user-agents.conf b/.dev-tools/beta_conf_files/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/blacklist-user-agents.conf
rename to .dev-tools/beta_conf_files/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/blockbots.conf b/.dev-tools/beta_conf_files/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/blockbots.conf
rename to .dev-tools/beta_conf_files/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/custom-bad-referrers.conf b/.dev-tools/beta_conf_files/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/custom-bad-referrers.conf
rename to .dev-tools/beta_conf_files/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/ddos.conf b/.dev-tools/beta_conf_files/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/ddos.conf
rename to .dev-tools/beta_conf_files/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/whitelist-domains.conf b/.dev-tools/beta_conf_files/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/whitelist-domains.conf
rename to .dev-tools/beta_conf_files/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf
rename to .dev-tools/beta_conf_files/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/.keep b/.dev-tools/beta_conf_files/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/.keep
rename to .dev-tools/beta_conf_files/conf.d/.keep
diff --git a/.dev-tools/_conf_files_test1/conf.d/botblocker-nginx-settings.conf b/.dev-tools/beta_conf_files/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/beta_conf_files/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf
rename to .dev-tools/beta_conf_files/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_test1/default.vhost b/.dev-tools/beta_conf_files/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_test1/default.vhost
rename to .dev-tools/beta_conf_files/default.vhost
diff --git a/.dev-tools/_conf_files_test1/nginx.conf b/.dev-tools/beta_conf_files/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/nginx.conf
rename to .dev-tools/beta_conf_files/nginx.conf
diff --git a/.dev-tools/_conf_files_test4/.keep b/.dev-tools/beta_conf_files_ip_whitelist/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test4/.keep
rename to .dev-tools/beta_conf_files_ip_whitelist/.keep
diff --git a/.dev-tools/_conf_files_test1/conf.d/.keep b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test1/conf.d/.keep
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/blacklist-domains.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/blacklist-domains.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/blacklist-user-agents.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/blacklist-user-agents.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/blockbots.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/blockbots.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/custom-bad-referrers.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/custom-bad-referrers.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/ddos.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/ddos.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/.keep b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/.keep
rename to .dev-tools/beta_conf_files_ip_whitelist/conf.d/.keep
diff --git a/.dev-tools/_conf_files_test3/conf.d/botblocker-nginx-settings.conf b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_testing_changes/default.vhost b/.dev-tools/beta_conf_files_ip_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/default.vhost
rename to .dev-tools/beta_conf_files_ip_whitelist/default.vhost
diff --git a/.dev-tools/_conf_files_testing_changes/nginx.conf b/.dev-tools/beta_conf_files_ip_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/nginx.conf
rename to .dev-tools/beta_conf_files_ip_whitelist/nginx.conf
diff --git a/.dev-tools/_conf_files_testing_changes/.keep b/.dev-tools/beta_conf_files_ratelimiting/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/.keep
rename to .dev-tools/beta_conf_files_ratelimiting/.keep
diff --git a/.dev-tools/_conf_files_test3/conf.d/.keep b/.dev-tools/beta_conf_files_ratelimiting/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test3/conf.d/.keep
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/bad-referrer-words.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/bad-referrer-words.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-ips.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-user-agents.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-user-agents.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/blockbots.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/blockbots.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/custom-bad-referrers.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/custom-bad-referrers.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/ddos.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/ddos.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/whitelist-domains.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/whitelist-domains.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/whitelist-ips.conf
rename to .dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/.keep b/.dev-tools/beta_conf_files_ratelimiting/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/.keep
rename to .dev-tools/beta_conf_files_ratelimiting/conf.d/.keep
diff --git a/.dev-tools/_conf_files_test4/conf.d/botblocker-nginx-settings.conf b/.dev-tools/beta_conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/beta_conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/globalblacklist.conf
rename to .dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/default.vhost b/.dev-tools/beta_conf_files_ratelimiting/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/default.vhost
rename to .dev-tools/beta_conf_files_ratelimiting/default.vhost
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/nginx.conf b/.dev-tools/beta_conf_files_ratelimiting/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/nginx.conf
rename to .dev-tools/beta_conf_files_ratelimiting/nginx.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/.keep b/.dev-tools/beta_conf_files_whitelist/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/.keep
rename to .dev-tools/beta_conf_files_whitelist/.keep
diff --git a/.dev-tools/_conf_files_test4/conf.d/.keep b/.dev-tools/beta_conf_files_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_test4/conf.d/.keep
rename to .dev-tools/beta_conf_files_whitelist/bots.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-domains.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blacklist-domains.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/blockbots.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/blockbots.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/ddos.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/ddos.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/.keep b/.dev-tools/beta_conf_files_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/.keep
rename to .dev-tools/beta_conf_files_whitelist/conf.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes/conf.d/botblocker-nginx-settings.conf b/.dev-tools/beta_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/beta_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/default.vhost b/.dev-tools/beta_conf_files_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/default.vhost
rename to .dev-tools/beta_conf_files_whitelist/default.vhost
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/nginx.conf b/.dev-tools/beta_conf_files_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/nginx.conf
rename to .dev-tools/beta_conf_files_whitelist/nginx.conf
diff --git a/.dev-tools/install-nginx-1.sh b/.dev-tools/install-nginx-1.sh
index 8d7fd8f07..d5dea712a 100755
--- a/.dev-tools/install-nginx-1.sh
+++ b/.dev-tools/install-nginx-1.sh
@@ -80,7 +80,7 @@ printf "\n"
 echo "${bold}${yellow}---------------------------"
 echo "${bold}${yellow}Making backup of nginx.conf"
 echo "${bold}${yellow}---------------------------"
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_nginx_conf_backup/nginx.conf
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_backup_nginxconf/nginx.conf
 }
 
 prepareVhost () {
@@ -192,10 +192,10 @@ printf "\n"
 echo "${bold}${green}-------------------------------------------------------"
 echo "${bold}${green}Backup all conf files and folders used during this test"
 echo "${bold}${green}-------------------------------------------------------"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files/nginx.conf
 }
 
 # ------------------
diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh
index 529e5aec1..f4382d7a3 100755
--- a/.dev-tools/install-nginx-2.sh
+++ b/.dev-tools/install-nginx-2.sh
@@ -201,10 +201,10 @@ echo "${bold}${green}-------------------------------------------------------"
 echo "${bold}${green}Backup all conf files and folders used during this test"
 echo "${bold}${green}-------------------------------------------------------"
 printf "\n"
-sudo cp /usr/local/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_test2/bots.d/
-sudo cp /usr/local/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_test2/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_test2/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_test2/nginx.conf
+sudo cp /usr/local/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test2_conf_files/bots.d/
+sudo cp /usr/local/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test2_conf_files/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test2_conf_files/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test2_conf_files/nginx.conf
 }
 
 
diff --git a/.dev-tools/test-blocker-rate-limiting.sh b/.dev-tools/test-blocker-rate-limiting.sh
index 23d35a59b..5fd592650 100755
--- a/.dev-tools/test-blocker-rate-limiting.sh
+++ b/.dev-tools/test-blocker-rate-limiting.sh
@@ -115,10 +115,10 @@ echo "${bold}${green}-------------------------------------------------------"
 echo "${bold}${green}Backup all conf files and folders used during this test"
 echo "${bold}${green}-------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ratelimiting/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ratelimiting/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ratelimiting/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ratelimiting/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ratelimiting/nginx.conf
 }
 
 # -----------
diff --git a/.dev-tools/test-blocker-whitelist-ips.sh b/.dev-tools/test-blocker-whitelist-ips.sh
index 82472e2da..6011cc280 100755
--- a/.dev-tools/test-blocker-whitelist-ips.sh
+++ b/.dev-tools/test-blocker-whitelist-ips.sh
@@ -98,10 +98,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_ip_whitelist/nginx.conf
 }
 
 blacklistOwnIP () {
diff --git a/.dev-tools/test-blocker-whitelist.sh b/.dev-tools/test-blocker-whitelist.sh
index 3b7a0029f..59add072f 100755
--- a/.dev-tools/test-blocker-whitelist.sh
+++ b/.dev-tools/test-blocker-whitelist.sh
@@ -240,10 +240,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/test1_conf_files_whitelist/nginx.conf
 }
 
 # -----------
diff --git a/.dev-tools/test-nginx-2.sh b/.dev-tools/test-nginx-2.sh
index db328dce7..2dda7c692 100755
--- a/.dev-tools/test-nginx-2.sh
+++ b/.dev-tools/test-nginx-2.sh
@@ -64,7 +64,6 @@ resetNginx () {
 echo "${bold}${green}------------------------------------------------"
 echo "${bold}${green}Disable any User Whitelisting and set to Default"
 echo "${bold}${green}------------------------------------------------"
-printf "\n"
 sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents-none.conf /usr/local/nginx/bots.d/blacklist-user-agents.conf
 }
 
@@ -224,10 +223,10 @@ shuf -n 10 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-user-agents.list > ${TRAVIS_
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.tmp > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.list
 sudo rm ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.tmp
 sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.list
+printf "\n"
 echo "${bold}${magenta}---------------------------"
 echo "${bold}${magenta}Testing 10 Random Bad Bots"
 echo "${bold}${magenta}---------------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-bots-for-test-quick.list
 lines=$(cat ${file})
@@ -244,10 +243,10 @@ IFS=""
 
 testGoodUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/good-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-bots-for-test.list
+printf "\n"
 echo "${bold}${magenta}---------------------"
 echo "${bold}${magenta}Testing All Good Bots"
 echo "${bold}${magenta}---------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-bots-for-test.list
 lines=$(cat ${file})
@@ -264,10 +263,10 @@ IFS=""
 
 testAllowedUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/allowed-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/allowed-bots-for-test.list
+printf "\n"
 echo "${bold}${magenta}------------------------"
 echo "${bold}${magenta}Testing All Allowed Bots"
 echo "${bold}${magenta}------------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/allowed-bots-for-test.list
 lines=$(cat ${file})
@@ -284,10 +283,10 @@ IFS=""
 
 testLimitedUserAgents () {
 sed 's/\\//g' ${TRAVIS_BUILD_DIR}/_generator_lists/limited-user-agents.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/limited-bots-for-test.list
+printf "\n"
 echo "${bold}${magenta}------------------------"
 echo "${bold}${magenta}Testing All Limited Bots"
 echo "${bold}${magenta}------------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/limited-bots-for-test.list
 lines=$(cat ${file})
@@ -305,10 +304,10 @@ IFS=""
 testRandomReferrers () {
 shuf -n 10 ${TRAVIS_BUILD_DIR}/_generator_lists/bad-referrers.list > ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test-quick.list
 sort -u ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test-quick.list -o ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test-quick.list
+printf "\n"
 echo "${bold}${magenta}---------------------------------"
 echo "${bold}${magenta}Testing 10 Random Bad Referrers"
 echo "${bold}${magenta}---------------------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/random-referrers-for-test-quick.list
 lines=$(cat ${file})
@@ -324,10 +323,10 @@ IFS=""
 }
 
 testGoodReferrers () {
+printf "\n"
 echo "${bold}${magenta}----------------------"
 echo "${bold}${magenta}Testing Good Referrers"
 echo "${bold}${magenta}----------------------"
-printf "\n"
 IFS=$'\n'
 file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-referrers-for-test.list
 lines=$(cat ${file})
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/.keep b/.dev-tools/test1_conf_backup_nginxconf/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/.keep
rename to .dev-tools/test1_conf_backup_nginxconf/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/nginx.conf b/.dev-tools/test1_conf_backup_nginxconf/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/nginx.conf
rename to .dev-tools/test1_conf_backup_nginxconf/nginx.conf
diff --git a/.dev-tools/_nginx_conf_backup/nginx13.conf b/.dev-tools/test1_conf_backup_nginxconf/nginx13.conf
similarity index 100%
rename from .dev-tools/_nginx_conf_backup/nginx13.conf
rename to .dev-tools/test1_conf_backup_nginxconf/nginx13.conf
diff --git a/.dev-tools/_conf_files_testing_changes/conf.d/.keep b/.dev-tools/test1_conf_files/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/conf.d/.keep
rename to .dev-tools/test1_conf_files/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/.keep b/.dev-tools/test1_conf_files/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/.keep
rename to .dev-tools/test1_conf_files/bots.d/.keep
diff --git a/.dev-tools/_conf_files_test3/bots.d/bad-referrer-words.conf b/.dev-tools/test1_conf_files/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/bad-referrer-words.conf
rename to .dev-tools/test1_conf_files/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/test1_conf_files/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/test1_conf_files/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/blacklist-ips.conf
rename to .dev-tools/test1_conf_files/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/blacklist-user-agents.conf b/.dev-tools/test1_conf_files/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test1_conf_files/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blockbots.conf b/.dev-tools/test1_conf_files/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blockbots.conf
rename to .dev-tools/test1_conf_files/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/custom-bad-referrers.conf b/.dev-tools/test1_conf_files/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test1_conf_files/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/ddos.conf b/.dev-tools/test1_conf_files/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/ddos.conf
rename to .dev-tools/test1_conf_files/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/whitelist-domains.conf b/.dev-tools/test1_conf_files/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/whitelist-domains.conf
rename to .dev-tools/test1_conf_files/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf
rename to .dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/.keep b/.dev-tools/test1_conf_files/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/.keep
rename to .dev-tools/test1_conf_files/conf.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test1_conf_files/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test1_conf_files/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_test1/conf.d/globalblacklist.conf
rename to .dev-tools/test1_conf_files/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/default.vhost b/.dev-tools/test1_conf_files/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/default.vhost
rename to .dev-tools/test1_conf_files/default.vhost
diff --git a/.dev-tools/_nginx_conf_backup/nginx.conf b/.dev-tools/test1_conf_files/nginx.conf
similarity index 100%
rename from .dev-tools/_nginx_conf_backup/nginx.conf
rename to .dev-tools/test1_conf_files/nginx.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/.keep b/.dev-tools/test1_conf_files_ip_whitelist/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/.keep
rename to .dev-tools/test1_conf_files_ip_whitelist/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/.keep b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/.keep
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/.keep
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blockbots.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/blockbots.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/ddos.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/ddos.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/.keep b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/.keep
rename to .dev-tools/test1_conf_files_ip_whitelist/conf.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/default.vhost b/.dev-tools/test1_conf_files_ip_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/default.vhost
rename to .dev-tools/test1_conf_files_ip_whitelist/default.vhost
diff --git a/.dev-tools/_conf_files_test4/nginx.conf b/.dev-tools/test1_conf_files_ip_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/nginx.conf
rename to .dev-tools/test1_conf_files_ip_whitelist/nginx.conf
diff --git a/.dev-tools/_nginx_conf_backup/.keep b/.dev-tools/test1_conf_files_ratelimiting/.keep
similarity index 100%
rename from .dev-tools/_nginx_conf_backup/.keep
rename to .dev-tools/test1_conf_files_ratelimiting/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/.keep b/.dev-tools/test1_conf_files_ratelimiting/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/.keep
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/.keep
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/bad-referrer-words.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/bad-referrer-words.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/blacklist-domains.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/blacklist-domains.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/blacklist-ips.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/blacklist-user-agents.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/blockbots.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/blockbots.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/custom-bad-referrers.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ratelimiting/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/bots.d/ddos.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/bots.d/ddos.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/ddos.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/whitelist-domains.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/whitelist-domains.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/whitelist-ips.conf
rename to .dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/conf.d/.keep b/.dev-tools/test1_conf_files_ratelimiting/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/conf.d/.keep
rename to .dev-tools/test1_conf_files_ratelimiting/conf.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test1_conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/conf.d/globalblacklist.conf
rename to .dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
diff --git a/.dev-tools/conf_files_ratelimiting/default.vhost b/.dev-tools/test1_conf_files_ratelimiting/default.vhost
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/default.vhost
rename to .dev-tools/test1_conf_files_ratelimiting/default.vhost
diff --git a/.dev-tools/conf_files_ip_whitelist/nginx.conf b/.dev-tools/test1_conf_files_ratelimiting/nginx.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/nginx.conf
rename to .dev-tools/test1_conf_files_ratelimiting/nginx.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/.keep b/.dev-tools/test1_conf_files_whitelist/.keep
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/.keep
rename to .dev-tools/test1_conf_files_whitelist/.keep
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/.keep b/.dev-tools/test1_conf_files_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/.keep
rename to .dev-tools/test1_conf_files_whitelist/bots.d/.keep
diff --git a/.dev-tools/conf_files_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/blockbots.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/blockbots.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/ddos.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/ddos.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/conf.d/.keep b/.dev-tools/test1_conf_files_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/conf.d/.keep
rename to .dev-tools/test1_conf_files_whitelist/conf.d/.keep
diff --git a/.dev-tools/conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test1_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/conf_files_whitelist/default.vhost b/.dev-tools/test1_conf_files_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/conf_files_whitelist/default.vhost
rename to .dev-tools/test1_conf_files_whitelist/default.vhost
diff --git a/.dev-tools/conf_files_ratelimiting/nginx.conf b/.dev-tools/test1_conf_files_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/nginx.conf
rename to .dev-tools/test1_conf_files_whitelist/nginx.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/.keep b/.dev-tools/test2_conf_files/.keep
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/.keep
rename to .dev-tools/test2_conf_files/.keep
diff --git a/.dev-tools/conf_files_ratelimiting/conf.d/.keep b/.dev-tools/test2_conf_files/bots.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/conf.d/.keep
rename to .dev-tools/test2_conf_files/bots.d/.keep
diff --git a/.dev-tools/_conf_files_test4/bots.d/bad-referrer-words.conf b/.dev-tools/test2_conf_files/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/bad-referrer-words.conf
rename to .dev-tools/test2_conf_files/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/blacklist-domains.conf b/.dev-tools/test2_conf_files/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/blacklist-domains.conf
rename to .dev-tools/test2_conf_files/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/blacklist-ips.conf b/.dev-tools/test2_conf_files/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/blacklist-ips.conf
rename to .dev-tools/test2_conf_files/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/blacklist-user-agents.conf b/.dev-tools/test2_conf_files/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test2_conf_files/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/blockbots.conf b/.dev-tools/test2_conf_files/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/blockbots.conf
rename to .dev-tools/test2_conf_files/bots.d/blockbots.conf
diff --git a/.dev-tools/conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/test2_conf_files/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test2_conf_files/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/ddos.conf b/.dev-tools/test2_conf_files/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/ddos.conf
rename to .dev-tools/test2_conf_files/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/whitelist-domains.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/whitelist-domains.conf
rename to .dev-tools/test2_conf_files/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/whitelist-ips.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/whitelist-ips.conf
rename to .dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/conf_files_test2/.keep b/.dev-tools/test2_conf_files/conf.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_test2/.keep
rename to .dev-tools/test2_conf_files/conf.d/.keep
diff --git a/.dev-tools/conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test2_conf_files/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test2_conf_files/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/conf.d/globalblacklist.conf
rename to .dev-tools/test2_conf_files/conf.d/globalblacklist.conf
diff --git a/.dev-tools/conf_files_test2/default.vhost b/.dev-tools/test2_conf_files/default.vhost
similarity index 100%
rename from .dev-tools/conf_files_test2/default.vhost
rename to .dev-tools/test2_conf_files/default.vhost
diff --git a/.dev-tools/conf_files_test2/nginx.conf b/.dev-tools/test2_conf_files/nginx.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/nginx.conf
rename to .dev-tools/test2_conf_files/nginx.conf
diff --git a/.dev-tools/conf_files_ratelimiting/.keep b/.dev-tools/test3_conf_files/.keep
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/.keep
rename to .dev-tools/test3_conf_files/.keep
diff --git a/.dev-tools/conf_files_test2/bots.d/.keep b/.dev-tools/test3_conf_files/bots.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/.keep
rename to .dev-tools/test3_conf_files/bots.d/.keep
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/bad-referrer-words.conf b/.dev-tools/test3_conf_files/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/bad-referrer-words.conf
rename to .dev-tools/test3_conf_files/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/blacklist-domains.conf b/.dev-tools/test3_conf_files/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/blacklist-domains.conf
rename to .dev-tools/test3_conf_files/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/blacklist-ips.conf b/.dev-tools/test3_conf_files/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/blacklist-ips.conf
rename to .dev-tools/test3_conf_files/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/test3_conf_files/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes_ip_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test3_conf_files/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/blockbots.conf b/.dev-tools/test3_conf_files/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/blockbots.conf
rename to .dev-tools/test3_conf_files/bots.d/blockbots.conf
diff --git a/.dev-tools/conf_files_ratelimiting/bots.d/custom-bad-referrers.conf b/.dev-tools/test3_conf_files/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/conf_files_ratelimiting/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test3_conf_files/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/ddos.conf b/.dev-tools/test3_conf_files/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/ddos.conf
rename to .dev-tools/test3_conf_files/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-domains.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_testing_changes/bots.d/whitelist-domains.conf
rename to .dev-tools/test3_conf_files/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf
rename to .dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/conf_files_test2/conf.d/.keep b/.dev-tools/test3_conf_files/conf.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_test2/conf.d/.keep
rename to .dev-tools/test3_conf_files/conf.d/.keep
diff --git a/.dev-tools/conf_files_test2/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test3_conf_files/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test3_conf_files/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/conf.d/globalblacklist.conf
rename to .dev-tools/test3_conf_files/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_test3/default.vhost b/.dev-tools/test3_conf_files/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_test3/default.vhost
rename to .dev-tools/test3_conf_files/default.vhost
diff --git a/.dev-tools/_conf_files_test3/nginx.conf b/.dev-tools/test3_conf_files/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_test3/nginx.conf
rename to .dev-tools/test3_conf_files/nginx.conf
diff --git a/.dev-tools/conf_files_whitelist/.keep b/.dev-tools/test4_conf_files/.keep
similarity index 100%
rename from .dev-tools/conf_files_whitelist/.keep
rename to .dev-tools/test4_conf_files/.keep
diff --git a/.dev-tools/conf_files_whitelist/bots.d/.keep b/.dev-tools/test4_conf_files/bots.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/.keep
rename to .dev-tools/test4_conf_files/bots.d/.keep
diff --git a/.dev-tools/conf_files_test2/bots.d/bad-referrer-words.conf b/.dev-tools/test4_conf_files/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/bad-referrer-words.conf
rename to .dev-tools/test4_conf_files/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/blacklist-domains.conf b/.dev-tools/test4_conf_files/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/blacklist-domains.conf
rename to .dev-tools/test4_conf_files/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/blacklist-ips.conf b/.dev-tools/test4_conf_files/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/blacklist-ips.conf
rename to .dev-tools/test4_conf_files/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/blacklist-user-agents.conf b/.dev-tools/test4_conf_files/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/blacklist-user-agents.conf
rename to .dev-tools/test4_conf_files/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/blockbots.conf b/.dev-tools/test4_conf_files/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/blockbots.conf
rename to .dev-tools/test4_conf_files/bots.d/blockbots.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/custom-bad-referrers.conf b/.dev-tools/test4_conf_files/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/custom-bad-referrers.conf
rename to .dev-tools/test4_conf_files/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/conf_files_whitelist/bots.d/ddos.conf b/.dev-tools/test4_conf_files/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/bots.d/ddos.conf
rename to .dev-tools/test4_conf_files/bots.d/ddos.conf
diff --git a/.dev-tools/conf_files_test2/bots.d/whitelist-domains.conf b/.dev-tools/test4_conf_files/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/conf_files_test2/bots.d/whitelist-domains.conf
rename to .dev-tools/test4_conf_files/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf
rename to .dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/conf_files_whitelist/conf.d/.keep b/.dev-tools/test4_conf_files/conf.d/.keep
similarity index 100%
rename from .dev-tools/conf_files_whitelist/conf.d/.keep
rename to .dev-tools/test4_conf_files/conf.d/.keep
diff --git a/.dev-tools/conf_files_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/test4_conf_files/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/test4_conf_files/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_test4/conf.d/globalblacklist.conf
rename to .dev-tools/test4_conf_files/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_test4/default.vhost b/.dev-tools/test4_conf_files/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_test4/default.vhost
rename to .dev-tools/test4_conf_files/default.vhost
diff --git a/.dev-tools/conf_files_whitelist/nginx.conf b/.dev-tools/test4_conf_files/nginx.conf
similarity index 100%
rename from .dev-tools/conf_files_whitelist/nginx.conf
rename to .dev-tools/test4_conf_files/nginx.conf