Code cleanup and re-org

Change-Id: Ifed47cfd5113be790eb57d92d4585b1427b56464
diff --git a/requirements.txt b/requirements.txt
index 4258352..e822bda 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,9 @@
+certifi==2021.10.8
+charset-normalizer==2.0.8
 click==8.0.1
 dataclasses==0.8
 Flask==2.0.1
+idna==3.3
 importlib-metadata==4.8.1
 imutils==0.5.4
 itsdangerous==2.0.1
@@ -8,6 +11,8 @@
 MarkupSafe==2.0.1
 numpy==1.19.5
 paho-mqtt==1.6.1
+requests==2.26.0
 typing-extensions==3.10.0.2
+urllib3==1.26.7
 Werkzeug==2.0.1
 zipp==3.6.0