176 files changed, 65 insertions, 143 deletions

diff --git a/.gitignore b/.gitignore
index 1280ea2..6de5e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,19 +6,19 @@
 config.def.h
 __pycache__
 .DS_Store
-/py_include/test/test_inverter_monitor.log
+/include/test/test_inverter_monitor.log
 /youtrack-certificate
 /cpp
-/py_include/test.py
+/include/test.py
 /bin/test.py
-/esp32-cam/CameraWebServer/wifi_password.h
+/arduino/esp32-cam/CameraWebServer/wifi_password.h
 cmake-build-*
 .pio
 platformio.ini
 CMakeListsPrivate.txt
-/platformio/*/CMakeLists.txt
-/platformio/*/CMakeListsPrivate.txt
-/platformio/*/.gitignore
+/pio/*/CMakeLists.txt
+/pio/*/CMakeListsPrivate.txt
+/pio/*/.gitignore
 *.swp
 
 /localwebsite/vendor
diff --git a/esp32-cam/CameraWebServer/CameraWebServer.ino b/arduino/esp32-cam/CameraWebServer/CameraWebServer.ino
index ef589d9..ef589d9 100644
--- a/esp32-cam/CameraWebServer/CameraWebServer.ino
+++ b/arduino/esp32-cam/CameraWebServer/CameraWebServer.ino
diff --git a/esp32-cam/CameraWebServer/app_httpd.cpp b/arduino/esp32-cam/CameraWebServer/app_httpd.cpp
index e397c70..e397c70 100644
--- a/esp32-cam/CameraWebServer/app_httpd.cpp
+++ b/arduino/esp32-cam/CameraWebServer/app_httpd.cpp
diff --git a/esp32-cam/CameraWebServer/camera_index.h b/arduino/esp32-cam/CameraWebServer/camera_index.h
index 5ca12e9..5ca12e9 100644
--- a/esp32-cam/CameraWebServer/camera_index.h
+++ b/arduino/esp32-cam/CameraWebServer/camera_index.h
diff --git a/esp32-cam/CameraWebServer/camera_pins.h b/arduino/esp32-cam/CameraWebServer/camera_pins.h
index e1be287..e1be287 100644
--- a/esp32-cam/CameraWebServer/camera_pins.h
+++ b/arduino/esp32-cam/CameraWebServer/camera_pins.h
diff --git a/esp32-cam/CameraWebServer/index_ov2640.html b/arduino/esp32-cam/CameraWebServer/index_ov2640.html
index 4f3738c..4f3738c 100644
--- a/esp32-cam/CameraWebServer/index_ov2640.html
+++ b/arduino/esp32-cam/CameraWebServer/index_ov2640.html
diff --git a/bin/__py_include.py b/bin/__py_include.py
index 7f95e28..8f98830 100644
--- a/bin/__py_include.py
+++ b/bin/__py_include.py
@@ -1,7 +1,7 @@
 import sys
 import os.path
 
-for _name in ('py_include',):
+for _name in ('include/py',):
     sys.path.extend([
         os.path.realpath(
             os.path.join(os.path.dirname(os.path.join(__file__)), '..', _name)
diff --git a/platformio/common/include/homekit/logging.h b/include/pio/include/homekit/logging.h
index 559ca33..559ca33 100644
--- a/platformio/common/include/homekit/logging.h
+++ b/include/pio/include/homekit/logging.h
diff --git a/platformio/common/include/homekit/macros.h b/include/pio/include/homekit/macros.h
index 7d3ad83..7d3ad83 100644
--- a/platformio/common/include/homekit/macros.h
+++ b/include/pio/include/homekit/macros.h
diff --git a/platformio/common/include/homekit/stopwatch.h b/include/pio/include/homekit/stopwatch.h
index bac2fcc..bac2fcc 100644
--- a/platformio/common/include/homekit/stopwatch.h
+++ b/include/pio/include/homekit/stopwatch.h
diff --git a/platformio/common/include/homekit/util.h b/include/pio/include/homekit/util.h
index e0780d8..e0780d8 100644
--- a/platformio/common/include/homekit/util.h
+++ b/include/pio/include/homekit/util.h
diff --git a/platformio/common/libs/config/homekit/config.cpp b/include/pio/libs/config/homekit/config.cpp
index 5bafcad..5bafcad 100644
--- a/platformio/common/libs/config/homekit/config.cpp
+++ b/include/pio/libs/config/homekit/config.cpp
diff --git a/platformio/common/libs/config/homekit/config.h b/include/pio/libs/config/homekit/config.h
index 28f01fb..28f01fb 100644
--- a/platformio/common/libs/config/homekit/config.h
+++ b/include/pio/libs/config/homekit/config.h
diff --git a/platformio/common/libs/config/library.json b/include/pio/libs/config/library.json
index 720d093..720d093 100644
--- a/platformio/common/libs/config/library.json
+++ b/include/pio/libs/config/library.json
diff --git a/platformio/common/libs/http_server/homekit/http_server.cpp b/include/pio/libs/http_server/homekit/http_server.cpp
index ea81f5b..ea81f5b 100644
--- a/platformio/common/libs/http_server/homekit/http_server.cpp
+++ b/include/pio/libs/http_server/homekit/http_server.cpp
diff --git a/platformio/common/libs/http_server/homekit/http_server.h b/include/pio/libs/http_server/homekit/http_server.h
index 8725a88..8725a88 100644
--- a/platformio/common/libs/http_server/homekit/http_server.h
+++ b/include/pio/libs/http_server/homekit/http_server.h
diff --git a/platformio/common/libs/http_server/library.json b/include/pio/libs/http_server/library.json
index ee2d369..ee2d369 100644
--- a/platformio/common/libs/http_server/library.json
+++ b/include/pio/libs/http_server/library.json
diff --git a/platformio/common/libs/led/homekit/led.cpp b/include/pio/libs/led/homekit/led.cpp
index ffefb04..ffefb04 100644
--- a/platformio/common/libs/led/homekit/led.cpp
+++ b/include/pio/libs/led/homekit/led.cpp
diff --git a/platformio/common/libs/led/homekit/led.h b/include/pio/libs/led/homekit/led.h
index 775d2eb..775d2eb 100644
--- a/platformio/common/libs/led/homekit/led.h
+++ b/include/pio/libs/led/homekit/led.h
diff --git a/platformio/common/libs/led/library.json b/include/pio/libs/led/library.json
index 6785d42..6785d42 100644
--- a/platformio/common/libs/led/library.json
+++ b/include/pio/libs/led/library.json
diff --git a/platformio/common/libs/main/homekit/main.cpp b/include/pio/libs/main/homekit/main.cpp
index 816c764..816c764 100644
--- a/platformio/common/libs/main/homekit/main.cpp
+++ b/include/pio/libs/main/homekit/main.cpp
diff --git a/platformio/common/libs/main/homekit/main.h b/include/pio/libs/main/homekit/main.h
index 78a0695..78a0695 100644
--- a/platformio/common/libs/main/homekit/main.h
+++ b/include/pio/libs/main/homekit/main.h
diff --git a/platformio/common/libs/main/library.json b/include/pio/libs/main/library.json
index 728d4f8..728d4f8 100644
--- a/platformio/common/libs/main/library.json
+++ b/include/pio/libs/main/library.json
diff --git a/platformio/common/libs/mqtt/homekit/mqtt/module.cpp b/include/pio/libs/mqtt/homekit/mqtt/module.cpp
index 0ac7637..0ac7637 100644
--- a/platformio/common/libs/mqtt/homekit/mqtt/module.cpp
+++ b/include/pio/libs/mqtt/homekit/mqtt/module.cpp
diff --git a/platformio/common/libs/mqtt/homekit/mqtt/module.h b/include/pio/libs/mqtt/homekit/mqtt/module.h
index 0a328f3..0a328f3 100644
--- a/platformio/common/libs/mqtt/homekit/mqtt/module.h
+++ b/include/pio/libs/mqtt/homekit/mqtt/module.h
diff --git a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.cpp b/include/pio/libs/mqtt/homekit/mqtt/mqtt.cpp
index aa769a5..aa769a5 100644
--- a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.cpp
+++ b/include/pio/libs/mqtt/homekit/mqtt/mqtt.cpp
diff --git a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.h b/include/pio/libs/mqtt/homekit/mqtt/mqtt.h
index 9e0c2be..9e0c2be 100644
--- a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.h
+++ b/include/pio/libs/mqtt/homekit/mqtt/mqtt.h
diff --git a/platformio/common/libs/mqtt/homekit/mqtt/payload.h b/include/pio/libs/mqtt/homekit/mqtt/payload.h
index 3e0fe0c..3e0fe0c 100644
--- a/platformio/common/libs/mqtt/homekit/mqtt/payload.h
+++ b/include/pio/libs/mqtt/homekit/mqtt/payload.h
diff --git a/platformio/common/libs/mqtt/library.json b/include/pio/libs/mqtt/library.json
index f3f2504..f3f2504 100644
--- a/platformio/common/libs/mqtt/library.json
+++ b/include/pio/libs/mqtt/library.json
diff --git a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp
index e0f797e..e0f797e 100644
--- a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp
+++ b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp
diff --git a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h
index bb7a81a..bb7a81a 100644
--- a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h
+++ b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h
diff --git a/platformio/common/libs/mqtt_module_diagnostics/library.json b/include/pio/libs/mqtt_module_diagnostics/library.json
index a3d3244..a3d3244 100644
--- a/platformio/common/libs/mqtt_module_diagnostics/library.json
+++ b/include/pio/libs/mqtt_module_diagnostics/library.json
diff --git a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp
index 4e976cd..4e976cd 100644
--- a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp
+++ b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp
diff --git a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.h b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.h
index df4f7ce..df4f7ce 100644
--- a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.h
+++ b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.h
diff --git a/platformio/common/libs/mqtt_module_ota/library.json b/include/pio/libs/mqtt_module_ota/library.json
index 4f40a47..4f40a47 100644
--- a/platformio/common/libs/mqtt_module_ota/library.json
+++ b/include/pio/libs/mqtt_module_ota/library.json
diff --git a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp
index 90c57f9..90c57f9 100644
--- a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp
+++ b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp
diff --git a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.h b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.h
index e245527..e245527 100644
--- a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.h
+++ b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.h
diff --git a/platformio/common/libs/mqtt_module_relay/library.json b/include/pio/libs/mqtt_module_relay/library.json
index 6cbbfb0..6cbbfb0 100644
--- a/platformio/common/libs/mqtt_module_relay/library.json
+++ b/include/pio/libs/mqtt_module_relay/library.json
diff --git a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp
index 409f38f..409f38f 100644
--- a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp
+++ b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp
diff --git a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h
index 7b28afc..7b28afc 100644
--- a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h
+++ b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h
diff --git a/platformio/common/libs/mqtt_module_temphum/library.json b/include/pio/libs/mqtt_module_temphum/library.json
index 068debd..068debd 100644
--- a/platformio/common/libs/mqtt_module_temphum/library.json
+++ b/include/pio/libs/mqtt_module_temphum/library.json
diff --git a/platformio/common/libs/relay/homekit/relay.cpp b/include/pio/libs/relay/homekit/relay.cpp
index b00a7a2..b00a7a2 100644
--- a/platformio/common/libs/relay/homekit/relay.cpp
+++ b/include/pio/libs/relay/homekit/relay.cpp
diff --git a/platformio/common/libs/relay/homekit/relay.h b/include/pio/libs/relay/homekit/relay.h
index 288cc05..288cc05 100644
--- a/platformio/common/libs/relay/homekit/relay.h
+++ b/include/pio/libs/relay/homekit/relay.h
diff --git a/platformio/common/libs/relay/library.json b/include/pio/libs/relay/library.json
index e878248..e878248 100644
--- a/platformio/common/libs/relay/library.json
+++ b/include/pio/libs/relay/library.json
diff --git a/platformio/common/libs/static/homekit/static.cpp b/include/pio/libs/static/homekit/static.cpp
index 366a09f..366a09f 100644
--- a/platformio/common/libs/static/homekit/static.cpp
+++ b/include/pio/libs/static/homekit/static.cpp
diff --git a/platformio/common/libs/static/homekit/static.h b/include/pio/libs/static/homekit/static.h
index c2617e9..c2617e9 100644
--- a/platformio/common/libs/static/homekit/static.h
+++ b/include/pio/libs/static/homekit/static.h
diff --git a/platformio/common/libs/static/library.json b/include/pio/libs/static/library.json
index bc650d7..bc650d7 100644
--- a/platformio/common/libs/static/library.json
+++ b/include/pio/libs/static/library.json
diff --git a/platformio/common/libs/temphum/homekit/temphum.cpp b/include/pio/libs/temphum/homekit/temphum.cpp
index e69b3a5..e69b3a5 100644
--- a/platformio/common/libs/temphum/homekit/temphum.cpp
+++ b/include/pio/libs/temphum/homekit/temphum.cpp
diff --git a/platformio/common/libs/temphum/homekit/temphum.h b/include/pio/libs/temphum/homekit/temphum.h
index 1952ce0..1952ce0 100644
--- a/platformio/common/libs/temphum/homekit/temphum.h
+++ b/include/pio/libs/temphum/homekit/temphum.h
diff --git a/platformio/common/libs/temphum/library.json b/include/pio/libs/temphum/library.json
index 329b7ca..329b7ca 100644
--- a/platformio/common/libs/temphum/library.json
+++ b/include/pio/libs/temphum/library.json
diff --git a/platformio/common/libs/wifi/homekit/wifi.cpp b/include/pio/libs/wifi/homekit/wifi.cpp
index 3060dd6..3060dd6 100644
--- a/platformio/common/libs/wifi/homekit/wifi.cpp
+++ b/include/pio/libs/wifi/homekit/wifi.cpp
diff --git a/platformio/common/libs/wifi/homekit/wifi.h b/include/pio/libs/wifi/homekit/wifi.h
index 3fe77cb..3fe77cb 100644
--- a/platformio/common/libs/wifi/homekit/wifi.h
+++ b/include/pio/libs/wifi/homekit/wifi.h
diff --git a/platformio/common/libs/wifi/library.json b/include/pio/libs/wifi/library.json
index c7faecd..c7faecd 100644
--- a/platformio/common/libs/wifi/library.json
+++ b/include/pio/libs/wifi/library.json
diff --git a/platformio/common/make_static.sh b/include/pio/make_static.sh
index d207e57..d207e57 100755
--- a/platformio/common/make_static.sh
+++ b/include/pio/make_static.sh
diff --git a/platformio/common/static/app.js b/include/pio/static/app.js
index 299230c..299230c 100644
--- a/platformio/common/static/app.js
+++ b/include/pio/static/app.js
diff --git a/platformio/common/static/favicon.ico b/include/pio/static/favicon.ico
index 6940e4f..6940e4f 100644
--- a/platformio/common/static/favicon.ico
+++ b/include/pio/static/favicon.ico
diff --git a/platformio/common/static/index.html b/include/pio/static/index.html
index d4a8040..d4a8040 100644
--- a/platformio/common/static/index.html
+++ b/include/pio/static/index.html
diff --git a/platformio/common/static/md5.js b/include/pio/static/md5.js
index b707a4e..b707a4e 100644
--- a/platformio/common/static/md5.js
+++ b/include/pio/static/md5.js
diff --git a/platformio/common/static/style.css b/include/pio/static/style.css
index 32bd02c..32bd02c 100644
--- a/platformio/common/static/style.css
+++ b/include/pio/static/style.css
diff --git a/py_include/__init__.py b/include/py/__init__.py
index e69de29..e69de29 100644
--- a/py_include/__init__.py
+++ b/include/py/__init__.py
diff --git a/py_include/homekit/__init__.py b/include/py/homekit/__init__.py
index e69de29..e69de29 100644
--- a/py_include/homekit/__init__.py
+++ b/include/py/homekit/__init__.py
diff --git a/py_include/homekit/api/__init__.py b/include/py/homekit/api/__init__.py
index d641f62..d641f62 100644
--- a/py_include/homekit/api/__init__.py
+++ b/include/py/homekit/api/__init__.py
diff --git a/py_include/homekit/api/__init__.pyi b/include/py/homekit/api/__init__.pyi
index 5b98161..5b98161 100644
--- a/py_include/homekit/api/__init__.pyi
+++ b/include/py/homekit/api/__init__.pyi
diff --git a/py_include/homekit/api/config.py b/include/py/homekit/api/config.py
index 00c1097..00c1097 100644
--- a/py_include/homekit/api/config.py
+++ b/include/py/homekit/api/config.py
diff --git a/py_include/homekit/api/errors/__init__.py b/include/py/homekit/api/errors/__init__.py
index efb06aa..efb06aa 100644
--- a/py_include/homekit/api/errors/__init__.py
+++ b/include/py/homekit/api/errors/__init__.py
diff --git a/py_include/homekit/api/errors/api_response_error.py b/include/py/homekit/api/errors/api_response_error.py
index 85d788b..85d788b 100644
--- a/py_include/homekit/api/errors/api_response_error.py
+++ b/include/py/homekit/api/errors/api_response_error.py
diff --git a/py_include/homekit/api/types/__init__.py b/include/py/homekit/api/types/__init__.py
index 9f27ff6..9f27ff6 100644
--- a/py_include/homekit/api/types/__init__.py
+++ b/include/py/homekit/api/types/__init__.py
diff --git a/py_include/homekit/api/types/types.py b/include/py/homekit/api/types/types.py
index 981e798..981e798 100644
--- a/py_include/homekit/api/types/types.py
+++ b/include/py/homekit/api/types/types.py
diff --git a/py_include/homekit/api/web_api_client.py b/include/py/homekit/api/web_api_client.py
index 15c1915..15c1915 100644
--- a/py_include/homekit/api/web_api_client.py
+++ b/include/py/homekit/api/web_api_client.py
diff --git a/py_include/homekit/audio/__init__.py b/include/py/homekit/audio/__init__.py
index e69de29..e69de29 100644
--- a/py_include/homekit/audio/__init__.py
+++ b/include/py/homekit/audio/__init__.py
diff --git a/py_include/homekit/audio/amixer.py b/include/py/homekit/audio/amixer.py
index 5133c97..5133c97 100644
--- a/py_include/homekit/audio/amixer.py
+++ b/include/py/homekit/audio/amixer.py
diff --git a/py_include/homekit/camera/__init__.py b/include/py/homekit/camera/__init__.py
index 626930b..626930b 100644
--- a/py_include/homekit/camera/__init__.py
+++ b/include/py/homekit/camera/__init__.py
diff --git a/py_include/homekit/camera/esp32.py b/include/py/homekit/camera/esp32.py
index fe6de0e..fe6de0e 100644
--- a/py_include/homekit/camera/esp32.py
+++ b/include/py/homekit/camera/esp32.py
diff --git a/py_include/homekit/camera/types.py b/include/py/homekit/camera/types.py
index de59022..de59022 100644
--- a/py_include/homekit/camera/types.py
+++ b/include/py/homekit/camera/types.py
diff --git a/py_include/homekit/camera/util.py b/include/py/homekit/camera/util.py
index 97f35aa..97f35aa 100644
--- a/py_include/homekit/camera/util.py
+++ b/include/py/homekit/camera/util.py
diff --git a/py_include/homekit/config/__init__.py b/include/py/homekit/config/__init__.py
index 2fa5214..2fa5214 100644
--- a/py_include/homekit/config/__init__.py
+++ b/include/py/homekit/config/__init__.py
diff --git a/py_include/homekit/config/_configs.py b/include/py/homekit/config/_configs.py
index 1628cba..1628cba 100644
--- a/py_include/homekit/config/_configs.py
+++ b/include/py/homekit/config/_configs.py
diff --git a/py_include/homekit/config/config.py b/include/py/homekit/config/config.py
index 7344386..7344386 100644
--- a/py_include/homekit/config/config.py
+++ b/include/py/homekit/config/config.py
diff --git a/py_include/homekit/database/__init__.py b/include/py/homekit/database/__init__.py
index b50cbce..b50cbce 100644
--- a/py_include/homekit/database/__init__.py
+++ b/include/py/homekit/database/__init__.py
diff --git a/py_include/homekit/database/__init__.pyi b/include/py/homekit/database/__init__.pyi
index 31aae5d..31aae5d 100644
--- a/py_include/homekit/database/__init__.pyi
+++ b/include/py/homekit/database/__init__.pyi
diff --git a/py_include/homekit/database/_base.py b/include/py/homekit/database/_base.py
index c01e62b..c01e62b 100644
--- a/py_include/homekit/database/_base.py
+++ b/include/py/homekit/database/_base.py
diff --git a/py_include/homekit/database/bots.py b/include/py/homekit/database/bots.py
index cde48b9..cde48b9 100644
--- a/py_include/homekit/database/bots.py
+++ b/include/py/homekit/database/bots.py
diff --git a/py_include/homekit/database/clickhouse.py b/include/py/homekit/database/clickhouse.py
index d0ec283..d0ec283 100644
--- a/py_include/homekit/database/clickhouse.py
+++ b/include/py/homekit/database/clickhouse.py
diff --git a/py_include/homekit/database/inverter.py b/include/py/homekit/database/inverter.py
index fc3f74f..fc3f74f 100644
--- a/py_include/homekit/database/inverter.py
+++ b/include/py/homekit/database/inverter.py
diff --git a/py_include/homekit/database/inverter_time_formats.py b/include/py/homekit/database/inverter_time_formats.py
index 7c37d30..7c37d30 100644
--- a/py_include/homekit/database/inverter_time_formats.py
+++ b/include/py/homekit/database/inverter_time_formats.py
diff --git a/py_include/homekit/database/mysql.py b/include/py/homekit/database/mysql.py
index fe97cd4..fe97cd4 100644
--- a/py_include/homekit/database/mysql.py
+++ b/include/py/homekit/database/mysql.py
diff --git a/py_include/homekit/database/sensors.py b/include/py/homekit/database/sensors.py
index 8155108..8155108 100644
--- a/py_include/homekit/database/sensors.py
+++ b/include/py/homekit/database/sensors.py
diff --git a/py_include/homekit/database/simple_state.py b/include/py/homekit/database/simple_state.py
index 2b8ebe7..2b8ebe7 100644
--- a/py_include/homekit/database/simple_state.py
+++ b/include/py/homekit/database/simple_state.py
diff --git a/py_include/homekit/database/sqlite.py b/include/py/homekit/database/sqlite.py
index 0af1f54..0af1f54 100644
--- a/py_include/homekit/database/sqlite.py
+++ b/include/py/homekit/database/sqlite.py
diff --git a/py_include/homekit/http/__init__.py b/include/py/homekit/http/__init__.py
index 6030e95..6030e95 100644
--- a/py_include/homekit/http/__init__.py
+++ b/include/py/homekit/http/__init__.py
diff --git a/py_include/homekit/http/http.py b/include/py/homekit/http/http.py
index 3e70751..3e70751 100644
--- a/py_include/homekit/http/http.py
+++ b/include/py/homekit/http/http.py
diff --git a/py_include/homekit/inverter/__init__.py b/include/py/homekit/inverter/__init__.py
index 8831ef3..8831ef3 100644
--- a/py_include/homekit/inverter/__init__.py
+++ b/include/py/homekit/inverter/__init__.py
diff --git a/py_include/homekit/inverter/config.py b/include/py/homekit/inverter/config.py
index e284dfe..e284dfe 100644
--- a/py_include/homekit/inverter/config.py
+++ b/include/py/homekit/inverter/config.py
diff --git a/py_include/homekit/inverter/emulator.py b/include/py/homekit/inverter/emulator.py
index e86b8bb..e86b8bb 100644
--- a/py_include/homekit/inverter/emulator.py
+++ b/include/py/homekit/inverter/emulator.py
diff --git a/py_include/homekit/inverter/inverter_wrapper.py b/include/py/homekit/inverter/inverter_wrapper.py
index df2c2fc..df2c2fc 100644
--- a/py_include/homekit/inverter/inverter_wrapper.py
+++ b/include/py/homekit/inverter/inverter_wrapper.py
diff --git a/py_include/homekit/inverter/monitor.py b/include/py/homekit/inverter/monitor.py
index 86f75ac..86f75ac 100644
--- a/py_include/homekit/inverter/monitor.py
+++ b/include/py/homekit/inverter/monitor.py
diff --git a/py_include/homekit/inverter/types.py b/include/py/homekit/inverter/types.py
index 57021f1..57021f1 100644
--- a/py_include/homekit/inverter/types.py
+++ b/include/py/homekit/inverter/types.py
diff --git a/py_include/homekit/inverter/util.py b/include/py/homekit/inverter/util.py
index a577e6a..a577e6a 100644
--- a/py_include/homekit/inverter/util.py
+++ b/include/py/homekit/inverter/util.py
diff --git a/py_include/homekit/media/__init__.py b/include/py/homekit/media/__init__.py
index 6923105..6923105 100644
--- a/py_include/homekit/media/__init__.py
+++ b/include/py/homekit/media/__init__.py
diff --git a/py_include/homekit/media/__init__.pyi b/include/py/homekit/media/__init__.pyi
index 77c2176..77c2176 100644
--- a/py_include/homekit/media/__init__.pyi
+++ b/include/py/homekit/media/__init__.pyi
diff --git a/py_include/homekit/media/node_client.py b/include/py/homekit/media/node_client.py
index eb39898..eb39898 100644
--- a/py_include/homekit/media/node_client.py
+++ b/include/py/homekit/media/node_client.py
diff --git a/py_include/homekit/media/node_server.py b/include/py/homekit/media/node_server.py
index 5d0803c..5d0803c 100644
--- a/py_include/homekit/media/node_server.py
+++ b/include/py/homekit/media/node_server.py
diff --git a/py_include/homekit/media/record.py b/include/py/homekit/media/record.py
index cd7447a..cd7447a 100644
--- a/py_include/homekit/media/record.py
+++ b/include/py/homekit/media/record.py
diff --git a/py_include/homekit/media/record_client.py b/include/py/homekit/media/record_client.py
index 322495c..322495c 100644
--- a/py_include/homekit/media/record_client.py
+++ b/include/py/homekit/media/record_client.py
diff --git a/py_include/homekit/media/storage.py b/include/py/homekit/media/storage.py
index dd74ff8..dd74ff8 100644
--- a/py_include/homekit/media/storage.py
+++ b/include/py/homekit/media/storage.py
diff --git a/py_include/homekit/media/types.py b/include/py/homekit/media/types.py
index acbc291..acbc291 100644
--- a/py_include/homekit/media/types.py
+++ b/include/py/homekit/media/types.py
diff --git a/py_include/homekit/mqtt/__init__.py b/include/py/homekit/mqtt/__init__.py
index 707d59c..707d59c 100644
--- a/py_include/homekit/mqtt/__init__.py
+++ b/include/py/homekit/mqtt/__init__.py
diff --git a/py_include/homekit/mqtt/_config.py b/include/py/homekit/mqtt/_config.py
index 9ba9443..9ba9443 100644
--- a/py_include/homekit/mqtt/_config.py
+++ b/include/py/homekit/mqtt/_config.py
diff --git a/py_include/homekit/mqtt/_module.py b/include/py/homekit/mqtt/_module.py
index 80f27bb..80f27bb 100644
--- a/py_include/homekit/mqtt/_module.py
+++ b/include/py/homekit/mqtt/_module.py
diff --git a/py_include/homekit/mqtt/_mqtt.py b/include/py/homekit/mqtt/_mqtt.py
index fb35a24..fb35a24 100644
--- a/py_include/homekit/mqtt/_mqtt.py
+++ b/include/py/homekit/mqtt/_mqtt.py
diff --git a/py_include/homekit/mqtt/_node.py b/include/py/homekit/mqtt/_node.py
index 4e259a4..4e259a4 100644
--- a/py_include/homekit/mqtt/_node.py
+++ b/include/py/homekit/mqtt/_node.py
diff --git a/py_include/homekit/mqtt/_payload.py b/include/py/homekit/mqtt/_payload.py
index 58eeae3..58eeae3 100644
--- a/py_include/homekit/mqtt/_payload.py
+++ b/include/py/homekit/mqtt/_payload.py
diff --git a/py_include/homekit/mqtt/_util.py b/include/py/homekit/mqtt/_util.py
index 390d463..390d463 100644
--- a/py_include/homekit/mqtt/_util.py
+++ b/include/py/homekit/mqtt/_util.py
diff --git a/py_include/homekit/mqtt/_wrapper.py b/include/py/homekit/mqtt/_wrapper.py
index 3c2774c..3c2774c 100644
--- a/py_include/homekit/mqtt/_wrapper.py
+++ b/include/py/homekit/mqtt/_wrapper.py
diff --git a/py_include/homekit/mqtt/module/diagnostics.py b/include/py/homekit/mqtt/module/diagnostics.py
index 5db5e99..5db5e99 100644
--- a/py_include/homekit/mqtt/module/diagnostics.py
+++ b/include/py/homekit/mqtt/module/diagnostics.py
diff --git a/py_include/homekit/mqtt/module/inverter.py b/include/py/homekit/mqtt/module/inverter.py
index 29bde0a..29bde0a 100644
--- a/py_include/homekit/mqtt/module/inverter.py
+++ b/include/py/homekit/mqtt/module/inverter.py
diff --git a/py_include/homekit/mqtt/module/ota.py b/include/py/homekit/mqtt/module/ota.py
index cd34332..cd34332 100644
--- a/py_include/homekit/mqtt/module/ota.py
+++ b/include/py/homekit/mqtt/module/ota.py
diff --git a/py_include/homekit/mqtt/module/relay.py b/include/py/homekit/mqtt/module/relay.py
index e968031..e968031 100644
--- a/py_include/homekit/mqtt/module/relay.py
+++ b/include/py/homekit/mqtt/module/relay.py
diff --git a/py_include/homekit/mqtt/module/temphum.py b/include/py/homekit/mqtt/module/temphum.py
index fd02cca..fd02cca 100644
--- a/py_include/homekit/mqtt/module/temphum.py
+++ b/include/py/homekit/mqtt/module/temphum.py
diff --git a/py_include/homekit/pio/__init__.py b/include/py/homekit/pio/__init__.py
index 7216bc4..7216bc4 100644
--- a/py_include/homekit/pio/__init__.py
+++ b/include/py/homekit/pio/__init__.py
diff --git a/py_include/homekit/pio/exceptions.py b/include/py/homekit/pio/exceptions.py
index a6afd20..a6afd20 100644
--- a/py_include/homekit/pio/exceptions.py
+++ b/include/py/homekit/pio/exceptions.py
diff --git a/py_include/homekit/pio/products.py b/include/py/homekit/pio/products.py
index 388da03..388da03 100644
--- a/py_include/homekit/pio/products.py
+++ b/include/py/homekit/pio/products.py
diff --git a/py_include/homekit/relay/__init__.py b/include/py/homekit/relay/__init__.py
index 406403d..406403d 100644
--- a/py_include/homekit/relay/__init__.py
+++ b/include/py/homekit/relay/__init__.py
diff --git a/py_include/homekit/relay/__init__.pyi b/include/py/homekit/relay/__init__.pyi
index 7a4a2f4..7a4a2f4 100644
--- a/py_include/homekit/relay/__init__.pyi
+++ b/include/py/homekit/relay/__init__.pyi
diff --git a/py_include/homekit/relay/sunxi_h3_client.py b/include/py/homekit/relay/sunxi_h3_client.py
index 8c8d6c4..8c8d6c4 100644
--- a/py_include/homekit/relay/sunxi_h3_client.py
+++ b/include/py/homekit/relay/sunxi_h3_client.py
diff --git a/py_include/homekit/relay/sunxi_h3_server.py b/include/py/homekit/relay/sunxi_h3_server.py
index 1f33969..1f33969 100644
--- a/py_include/homekit/relay/sunxi_h3_server.py
+++ b/include/py/homekit/relay/sunxi_h3_server.py
diff --git a/py_include/homekit/soundsensor/__init__.py b/include/py/homekit/soundsensor/__init__.py
index 30052f8..30052f8 100644
--- a/py_include/homekit/soundsensor/__init__.py
+++ b/include/py/homekit/soundsensor/__init__.py
diff --git a/py_include/homekit/soundsensor/__init__.pyi b/include/py/homekit/soundsensor/__init__.pyi
index cb34972..cb34972 100644
--- a/py_include/homekit/soundsensor/__init__.pyi
+++ b/include/py/homekit/soundsensor/__init__.pyi
diff --git a/py_include/homekit/soundsensor/node.py b/include/py/homekit/soundsensor/node.py
index 292452f..292452f 100644
--- a/py_include/homekit/soundsensor/node.py
+++ b/include/py/homekit/soundsensor/node.py
diff --git a/py_include/homekit/soundsensor/server.py b/include/py/homekit/soundsensor/server.py
index a627390..a627390 100644
--- a/py_include/homekit/soundsensor/server.py
+++ b/include/py/homekit/soundsensor/server.py
diff --git a/py_include/homekit/soundsensor/server_client.py b/include/py/homekit/soundsensor/server_client.py
index 7eef996..7eef996 100644
--- a/py_include/homekit/soundsensor/server_client.py
+++ b/include/py/homekit/soundsensor/server_client.py
diff --git a/py_include/homekit/telegram/__init__.py b/include/py/homekit/telegram/__init__.py
index a68dae1..a68dae1 100644
--- a/py_include/homekit/telegram/__init__.py
+++ b/include/py/homekit/telegram/__init__.py
diff --git a/py_include/homekit/telegram/_botcontext.py b/include/py/homekit/telegram/_botcontext.py
index a143bfe..a143bfe 100644
--- a/py_include/homekit/telegram/_botcontext.py
+++ b/include/py/homekit/telegram/_botcontext.py
diff --git a/py_include/homekit/telegram/_botdb.py b/include/py/homekit/telegram/_botdb.py
index 4e1aec0..4e1aec0 100644
--- a/py_include/homekit/telegram/_botdb.py
+++ b/include/py/homekit/telegram/_botdb.py
diff --git a/py_include/homekit/telegram/_botlang.py b/include/py/homekit/telegram/_botlang.py
index f5f85bb..f5f85bb 100644
--- a/py_include/homekit/telegram/_botlang.py
+++ b/include/py/homekit/telegram/_botlang.py
diff --git a/py_include/homekit/telegram/_botutil.py b/include/py/homekit/telegram/_botutil.py
index 111a704..111a704 100644
--- a/py_include/homekit/telegram/_botutil.py
+++ b/include/py/homekit/telegram/_botutil.py
diff --git a/py_include/homekit/telegram/aio.py b/include/py/homekit/telegram/aio.py
index fc87c1c..fc87c1c 100644
--- a/py_include/homekit/telegram/aio.py
+++ b/include/py/homekit/telegram/aio.py
diff --git a/py_include/homekit/telegram/bot.py b/include/py/homekit/telegram/bot.py
index 2e33bea..2e33bea 100644
--- a/py_include/homekit/telegram/bot.py
+++ b/include/py/homekit/telegram/bot.py
diff --git a/py_include/homekit/telegram/config.py b/include/py/homekit/telegram/config.py
index 4c7d74b..4c7d74b 100644
--- a/py_include/homekit/telegram/config.py
+++ b/include/py/homekit/telegram/config.py
diff --git a/py_include/homekit/telegram/telegram.py b/include/py/homekit/telegram/telegram.py
index f42363e..f42363e 100644
--- a/py_include/homekit/telegram/telegram.py
+++ b/include/py/homekit/telegram/telegram.py
diff --git a/py_include/homekit/temphum/__init__.py b/include/py/homekit/temphum/__init__.py
index 46d14e6..46d14e6 100644
--- a/py_include/homekit/temphum/__init__.py
+++ b/include/py/homekit/temphum/__init__.py
diff --git a/py_include/homekit/temphum/base.py b/include/py/homekit/temphum/base.py
index 602cab7..602cab7 100644
--- a/py_include/homekit/temphum/base.py
+++ b/include/py/homekit/temphum/base.py
diff --git a/py_include/homekit/temphum/i2c.py b/include/py/homekit/temphum/i2c.py
index 7d8e2e3..7d8e2e3 100644
--- a/py_include/homekit/temphum/i2c.py
+++ b/include/py/homekit/temphum/i2c.py
diff --git a/py_include/homekit/util.py b/include/py/homekit/util.py
index 11e7116..11e7116 100644
--- a/py_include/homekit/util.py
+++ b/include/py/homekit/util.py
diff --git a/py_include/pyA20/__init__.pyi b/include/py/pyA20/__init__.pyi
index e69de29..e69de29 100644
--- a/py_include/pyA20/__init__.pyi
+++ b/include/py/pyA20/__init__.pyi
diff --git a/py_include/pyA20/gpio/connector.pyi b/include/py/pyA20/gpio/connector.pyi
index 12b2b6e..12b2b6e 100644
--- a/py_include/pyA20/gpio/connector.pyi
+++ b/include/py/pyA20/gpio/connector.pyi
diff --git a/py_include/pyA20/gpio/gpio.pyi b/include/py/pyA20/gpio/gpio.pyi
index 225fcbe..225fcbe 100644
--- a/py_include/pyA20/gpio/gpio.pyi
+++ b/include/py/pyA20/gpio/gpio.pyi
diff --git a/py_include/pyA20/gpio/port.pyi b/include/py/pyA20/gpio/port.pyi
index 17f69fe..17f69fe 100644
--- a/py_include/pyA20/gpio/port.pyi
+++ b/include/py/pyA20/gpio/port.pyi
diff --git a/py_include/pyA20/port.pyi b/include/py/pyA20/port.pyi
index e69de29..e69de29 100644
--- a/py_include/pyA20/port.pyi
+++ b/include/py/pyA20/port.pyi
diff --git a/py_include/syncleo/__init__.py b/include/py/syncleo/__init__.py
index 32563a5..32563a5 100644
--- a/py_include/syncleo/__init__.py
+++ b/include/py/syncleo/__init__.py
diff --git a/py_include/syncleo/kettle.py b/include/py/syncleo/kettle.py
index d6e0dd6..d6e0dd6 100644
--- a/py_include/syncleo/kettle.py
+++ b/include/py/syncleo/kettle.py
diff --git a/py_include/syncleo/protocol.py b/include/py/syncleo/protocol.py
index 36a1a8f..36a1a8f 100644
--- a/py_include/syncleo/protocol.py
+++ b/include/py/syncleo/protocol.py
diff --git a/platformio/dumb_mqtt/src/main.cpp b/pio/dumb_mqtt/src/main.cpp
index eefc165..eefc165 100644
--- a/platformio/dumb_mqtt/src/main.cpp
+++ b/pio/dumb_mqtt/src/main.cpp
diff --git a/platformio/relayctl/src/main.cpp b/pio/relayctl/src/main.cpp
index c399641..c399641 100644
--- a/platformio/relayctl/src/main.cpp
+++ b/pio/relayctl/src/main.cpp
diff --git a/platformio/temphum/src/main.cpp b/pio/temphum/src/main.cpp
index 2df8638..2df8638 100644
--- a/platformio/temphum/src/main.cpp
+++ b/pio/temphum/src/main.cpp
diff --git a/platformio/temphum_relayctl/src/main.cpp b/pio/temphum_relayctl/src/main.cpp
index 7f0945e..7f0945e 100644
--- a/platformio/temphum_relayctl/src/main.cpp
+++ b/pio/temphum_relayctl/src/main.cpp
diff --git a/platformio/dumb_mqtt/.gitignore b/platformio/dumb_mqtt/.gitignore
deleted file mode 100644
index 3fe18ad..0000000
--- a/platformio/dumb_mqtt/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.pio
-CMakeListsPrivate.txt
-cmake-build-*/ 
diff --git a/platformio/relayctl/.gitignore b/platformio/relayctl/.gitignore
deleted file mode 100644
index 3fe18ad..0000000
--- a/platformio/relayctl/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.pio
-CMakeListsPrivate.txt
-cmake-build-*/ 
diff --git a/platformio/temphum/.gitignore b/platformio/temphum/.gitignore
deleted file mode 100644
index 3fe18ad..0000000
--- a/platformio/temphum/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.pio
-CMakeListsPrivate.txt
-cmake-build-*/ 
diff --git a/test/__py_include.py b/test/__py_include.py
new file mode 100644
index 0000000..8f98830
--- /dev/null
+++ b/test/__py_include.py
@@ -0,0 +1,9 @@
+import sys
+import os.path
+
+for _name in ('include/py',):
+    sys.path.extend([
+        os.path.realpath(
+            os.path.join(os.path.dirname(os.path.join(__file__)), '..', _name)
+        )
+    ])
\ No newline at end of file
diff --git a/test/mqtt_relay_server_util.py b/test/mqtt_relay_server_util.py
index ac6a9ae..6c02d75 100755
--- a/test/mqtt_relay_server_util.py
+++ b/test/mqtt_relay_server_util.py
@@ -1,17 +1,11 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
-from src.home.config import config
-from src.home.mqtt.relay import MQTTRelayClient
+from homekit.config import config
 
 
 if __name__ == '__main__':
-    config.load_app('test_mqtt_relay_server')
-    relay = MQTTRelayClient('test')
-    relay.connect_and_loop()
+    print(config)
+    # config.load_app('test_mqtt_relay_server')
+    # relay = MQTTRelayClient('test')
+    # relay.connect_and_loop()
diff --git a/test/mqtt_relay_util.py b/test/mqtt_relay_util.py
index 0d8c764..394bbe8 100755
--- a/test/mqtt_relay_util.py
+++ b/test/mqtt_relay_util.py
@@ -1,15 +1,9 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
 from argparse import ArgumentParser
-from src.home.config import config
-from src.home.mqtt.relay import MQTTRelayController
+from homekit.config import config
+from homekit.mqtt.relay import MQTTRelayController
 
 
 if __name__ == '__main__':
diff --git a/test/test.py b/test/test.py
index 413c25c..267a19f 100755
--- a/test/test.py
+++ b/test/test.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import __py_include
 from homekit.relay import RelayClient
 
 
diff --git a/test/test_amixer.py b/test/test_amixer.py
index 464941e..e4abc73 100755
--- a/test/test_amixer.py
+++ b/test/test_amixer.py
@@ -1,12 +1,9 @@
 #!/usr/bin/env python3
-import sys, os.path
-sys.path.extend([
-    os.path.realpath(os.path.join(os.path.dirname(os.path.join(__file__)), '..')),
-])
+import __py_include
 
 from argparse import ArgumentParser
-from src.home.config import config
-from src.home.audio import amixer
+from homekit.config import config
+from homekit.audio import amixer
 
 
 def validate_control(input: str):
diff --git a/test/test_api.py b/test/test_api.py
index ecf8764..80ab62a 100755
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -1,15 +1,9 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
-from src.home.api import WebApiClient
-from src.home.api.types import BotType
-from src.home.config import config
+from homekit.api import WebApiClient
+from homekit.api.types import BotType
+from homekit.config import config
 
 
 if __name__ == '__main__':
diff --git a/test/test_esp32_cam.py b/test/test_esp32_cam.py
index 6a4ad25..962768f 100755
--- a/test/test_esp32_cam.py
+++ b/test/test_esp32_cam.py
@@ -1,18 +1,12 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
 from pprint import pprint
 from argparse import ArgumentParser
 from time import sleep
-from src.home.util import Addr
-from src.home.camera import esp32
-from src.home.config import config
+from homekit.util import Addr
+from homekit.camera import esp32
+from homekit.config import config
 
 if __name__ == '__main__':
     parser = ArgumentParser()
diff --git a/test/test_inverter_monitor.py b/test/test_inverter_monitor.py
index 621c0e9..3231bab 100755
--- a/test/test_inverter_monitor.py
+++ b/test/test_inverter_monitor.py
@@ -1,22 +1,11 @@
 #!/usr/bin/env python3
-import cmd
-import time
-import logging
-import socket
-import sys
-import threading
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
 from enum import Enum, auto
 from typing import Optional
-from src.home.util import stringify
-from src.home.config import config
-from src.home.inverter import (
+from homekit.util import stringify
+from homekit.config import config
+from homekit.inverter import (
     wrapper_instance as inverter,
 
     InverterMonitor,
diff --git a/test/test_ipcam_server_cleanup.py b/test/test_ipcam_server_cleanup.py
index 5f313a4..ae8d31c 100644
--- a/test/test_ipcam_server_cleanup.py
+++ b/test/test_ipcam_server_cleanup.py
@@ -1,19 +1,13 @@
 #!/usr/bin/env python3
-import shutil
-import sys
+import __py_include
+import logging
 import os
+import shutil
 import re
-import logging
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
 
 from functools import cmp_to_key
 from datetime import datetime
-from pprint import pprint
-from src.home.config import config
+from homekit.config import config
 
 
 logger = logging.getLogger(__name__)
diff --git a/test/test_polaris_stuff.py b/test/test_polaris_stuff.py
index b921891..7778667 100755
--- a/test/test_polaris_stuff.py
+++ b/test/test_polaris_stuff.py
@@ -1,13 +1,6 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
-
-import src.syncleo as polaris
+import __py_include
+import syncleo
 
 
 if __name__ == '__main__':
diff --git a/test/test_record_upload.py b/test/test_record_upload.py
index c0daceb..f9c83d8 100755
--- a/test/test_record_upload.py
+++ b/test/test_record_upload.py
@@ -1,19 +1,12 @@
 #!/usr/bin/env python3
+import __py_include
 import logging
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
-
 import time
 
-from src.home.api import WebApiClient, RequestParams
-from src.home.config import config
-from src.home.media import SoundRecordClient
-from src.home.util import Addr
+from homekit.api import WebApiClient, RequestParams
+from homekit.config import config
+from homekit.media import SoundRecordClient
+from homekit.util import Addr
 
 logger = logging.getLogger(__name__)
 
diff --git a/test/test_send_fake_sound_hit.py b/test/test_send_fake_sound_hit.py
index 61886cd..3cc3e50 100755
--- a/test/test_send_fake_sound_hit.py
+++ b/test/test_send_fake_sound_hit.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 
 from argparse import ArgumentParser
-from src.home.util import send_datagram, stringify, Addr
+from homekit.util import send_datagram, stringify, Addr
 
 
 if __name__ == '__main__':
diff --git a/test/test_sensors_plot.py b/test/test_sensors_plot.py
deleted file mode 100755
index e69de29..0000000
--- a/test/test_sensors_plot.py
+++ /dev/null
diff --git a/test/test_sound_node_client.py b/test/test_sound_node_client.py
index 16feb78..c3748ca 100755
--- a/test/test_sound_node_client.py
+++ b/test/test_sound_node_client.py
@@ -1,11 +1,8 @@
 #!/usr/bin/env python3
-import sys, os.path
-sys.path.extend([
-    os.path.realpath(os.path.join(os.path.dirname(os.path.join(__file__)), '..')),
-])
+import __py_include
 
-from src.home.api.errors import ApiResponseError
-from src.home.media import SoundNodeClient
+from homekit.api.errors import ApiResponseError
+from homekit.media import SoundNodeClient
 
 
 if __name__ == '__main__':
diff --git a/test/test_sound_server_api.py b/test/test_sound_server_api.py
index 77fe1ba..11cd422 100755
--- a/test/test_sound_server_api.py
+++ b/test/test_sound_server_api.py
@@ -1,17 +1,11 @@
 #!/usr/bin/env python3
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import __py_include
 import threading
 
 from time import sleep
-from src.home.config import config
-from src.home.api import WebApiClient
-from src.home.api.types import SoundSensorLocation
+from homekit.config import config
+from homekit.api import WebApiClient
+from homekit.api.types import SoundSensorLocation
 from typing import List, Tuple
 
 interrupted = False
diff --git a/test/test_stopwatch.py b/test/test_stopwatch.py
index 9dd7762..1da0fe7 100755
--- a/test/test_stopwatch.py
+++ b/test/test_stopwatch.py
@@ -1,3 +1,4 @@
+import __py_include
 from homekit.util import Stopwatch, StopwatchError
 from time import sleep
 
diff --git a/test/test_telegram_aio_send_photo.py b/test/test_telegram_aio_send_photo.py
index 4d05c03..019fa92 100644
--- a/test/test_telegram_aio_send_photo.py
+++ b/test/test_telegram_aio_send_photo.py
@@ -1,16 +1,9 @@
 #!/usr/bin/env python3
+import __py_include
 import asyncio
-import sys
-import os.path
-sys.path.extend([
-    os.path.realpath(
-        os.path.join(os.path.dirname(os.path.join(__file__)), '..')
-    )
-])
+import homekit.telegram.aio as telegram
 
-import src.home.telegram.aio as telegram
-
-from src.home.config import config
+from homekit.config import config
 
 
 async def main():