diff --git a/unit_tests/README.md b/NOLA-README.md
similarity index 100%
rename from unit_tests/README.md
rename to NOLA-README.md
diff --git a/unit_tests/JfrogHelper.py b/libs/JfrogHelper.py
similarity index 100%
rename from unit_tests/JfrogHelper.py
rename to libs/JfrogHelper.py
diff --git a/unit_tests/ap_ssh.py b/libs/apnos/ap_ssh.py
similarity index 100%
rename from unit_tests/ap_ssh.py
rename to libs/apnos/ap_ssh.py
diff --git a/unit_tests/cloudsdk.py b/libs/cloudsdk/cloudsdk.py
similarity index 100%
rename from unit_tests/cloudsdk.py
rename to libs/cloudsdk/cloudsdk.py
diff --git a/unit_tests/lab_ap_info.py b/libs/lab_ap_info.py
similarity index 100%
rename from unit_tests/lab_ap_info.py
rename to libs/lab_ap_info.py
diff --git a/unit_tests/lf_lib.py b/libs/lanforge/lf_lib.py
similarity index 100%
rename from unit_tests/lf_lib.py
rename to libs/lanforge/lf_lib.py
diff --git a/unit_tests/lf_tests.py b/libs/lanforge/lf_tests.py
similarity index 100%
rename from unit_tests/lf_tests.py
rename to libs/lanforge/lf_tests.py
diff --git a/unit_tests/testrail_api.py b/libs/testrails/testrail_api.py
similarity index 100%
rename from unit_tests/testrail_api.py
rename to libs/testrails/testrail_api.py
diff --git a/unit_tests/Nightly_Sanity.py b/tests/Nightly_Sanity.py
similarity index 100%
rename from unit_tests/Nightly_Sanity.py
rename to tests/Nightly_Sanity.py
diff --git a/unit_tests/Throughput_Test.py b/tests/Throughput_Test.py
similarity index 100%
rename from unit_tests/Throughput_Test.py
rename to tests/Throughput_Test.py
diff --git a/unit_tests/UnitTestBase.py b/tests/UnitTestBase.py
similarity index 100%
rename from unit_tests/UnitTestBase.py
rename to tests/UnitTestBase.py
diff --git a/unit_tests/eap_connect.py b/tests/eap_connect.py
similarity index 100%
rename from unit_tests/eap_connect.py
rename to tests/eap_connect.py
diff --git a/unit_tests/sanity_status.json b/tests/sanity_status.json
similarity index 100%
rename from unit_tests/sanity_status.json
rename to tests/sanity_status.json
diff --git a/unit_tests/single_client_throughput.py b/tests/single_client_throughput.py
similarity index 100%
rename from unit_tests/single_client_throughput.py
rename to tests/single_client_throughput.py
diff --git a/unit_tests/reports/report_template.php b/tests/templates/report_template.php
similarity index 100%
rename from unit_tests/reports/report_template.php
rename to tests/templates/report_template.php
diff --git a/unit_tests/templates/ssid_profile_template.json b/tests/templates/ssid_profile_template.json
similarity index 100%
rename from unit_tests/templates/ssid_profile_template.json
rename to tests/templates/ssid_profile_template.json
diff --git a/tools/debug_nola01.sh b/tools/debug_nola01.sh
new file mode 100755
index 000000000..19700762f
--- /dev/null
+++ b/tools/debug_nola01.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Commands to grab debug info off of NOLA-01.  Everything is hard-coded assuming you use
+# ssh tunnel in the suggested way.  Otherwise, you will need to edit things...
+
+set -x
+
+NOLANUM=01
+PORTAL=wlan-portal-svc.cicd.lab.wlan.tip.build
+APPORT=8803
+APTTY=/dev/ttyAP1
+MODEL=ecw5410
+
+# cloud sdk profile dump
+./query_sdk.py --testrail-user-id NONE --model $MODEL --sdk-base-url https://$PORTAL --sdk-user-id support@example.com --sdk-user-password support --type profile --cmd get > /tmp/nola-$NOLANUM-profiles.txt
+
+# ovsdb-client dump
+./query_ap.py --ap-jumphost-address localhost --ap-jumphost-port $APPORT --ap-jumphost-password pumpkin77 --ap-jumphost-tty $APTTY -m $MODEL --cmd "ovsdb-client dump" > /tmp/nola-$NOLANUM-ap.txt
+
+# interface info
+./query_ap.py --ap-jumphost-address localhost --ap-jumphost-port $APPORT --ap-jumphost-password pumpkin77 --ap-jumphost-tty $APTTY -m $MODEL --cmd "iwinfo && brctl show" > /tmp/nola-$NOLANUM-ap-if.txt
+
+# TODO:  Add more things here as we learn what better provides debug info to cloud.
+
+echo "Grab:  /tmp/nola-$NOLANUM-profiles.txt /tmp/nola-$NOLANUM-ap.txt /tmp/nola-$NOLANUM-ap-if.txt"
diff --git a/unit_tests/debug_nola12.sh b/tools/debug_nola12.sh
similarity index 100%
rename from unit_tests/debug_nola12.sh
rename to tools/debug_nola12.sh
diff --git a/unit_tests/query_ap.py b/tools/query_ap.py
similarity index 100%
rename from unit_tests/query_ap.py
rename to tools/query_ap.py
diff --git a/unit_tests/query_sdk.py b/tools/query_sdk.py
similarity index 100%
rename from unit_tests/query_sdk.py
rename to tools/query_sdk.py
diff --git a/unit_tests/sdk_set_profile.py b/tools/sdk_set_profile.py
similarity index 100%
rename from unit_tests/sdk_set_profile.py
rename to tools/sdk_set_profile.py
diff --git a/unit_tests/sdk_upgrade_fw.py b/tools/sdk_upgrade_fw.py
similarity index 100%
rename from unit_tests/sdk_upgrade_fw.py
rename to tools/sdk_upgrade_fw.py