move files, rename home package to homekit

151 files changed, 205 insertions, 159 deletions

diff --git a/.gitignore b/.gitignore
index 4ffc1b1..1280ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,11 @@
 config.def.h
 __pycache__
 .DS_Store
-/src/test/test_inverter_monitor.log
+/py_include/test/test_inverter_monitor.log
 /youtrack-certificate
 /cpp
-/src/test.py
+/py_include/test.py
+/bin/test.py
 /esp32-cam/CameraWebServer/wifi_password.h
 cmake-build-*
 .pio
diff --git a/bin/__py_include.py b/bin/__py_include.py
new file mode 100644
index 0000000..7f95e28
--- /dev/null
+++ b/bin/__py_include.py
@@ -0,0 +1,9 @@
+import sys
+import os.path
+
+for _name in ('py_include',):
+    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/src/camera_node.py b/bin/camera_node.py
index 3f2c5a4..1485557 100755
--- a/src/camera_node.py
+++ b/bin/camera_node.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import asyncio
 import time
+import __py_include
 
-from home.config import config
-from home.media import MediaNodeServer, ESP32CameraRecordStorage, CameraRecorder
-from home.camera import CameraType, esp32
-from home.util import Addr
-from home import http
+from homekit.config import config
+from homekit.media import MediaNodeServer, ESP32CameraRecordStorage, CameraRecorder
+from homekit.camera import CameraType, esp32
+from homekit.util import Addr
+from homekit import http
 
 
 # Implements HTTP API for a camera.
diff --git a/src/electricity_calc.py b/bin/electricity_calc.py
index 8ea5a1c..cff2327 100755
--- a/src/electricity_calc.py
+++ b/bin/electricity_calc.py
@@ -3,11 +3,12 @@ import logging
 import os
 import sys
 import inspect
+import __py_include
 
-from home.config import config  # do not remove this import!
+from homekit.config import config  # do not remove this import!
 from datetime import datetime, timedelta
 from logging import Logger
-from home.database import InverterDatabase
+from homekit.database import InverterDatabase
 from argparse import ArgumentParser, ArgumentError
 from typing import Optional
 
diff --git a/src/esp32_capture.py b/bin/esp32_capture.py
index 0441565..839114d 100755
--- a/src/esp32_capture.py
+++ b/bin/esp32_capture.py
@@ -2,10 +2,11 @@
 import asyncio
 import logging
 import os.path
+import __py_include
 
 from argparse import ArgumentParser
-from home.camera.esp32 import WebClient
-from home.util import Addr
+from homekit.camera.esp32 import WebClient
+from homekit.util import Addr
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from datetime import datetime
 from typing import Optional
diff --git a/src/esp32cam_capture_diff_node.py b/bin/esp32cam_capture_diff_node.py
index 59482f7..d664c6d 100755
--- a/src/esp32cam_capture_diff_node.py
+++ b/bin/esp32cam_capture_diff_node.py
@@ -3,11 +3,12 @@ import asyncio
 import logging
 import os.path
 import tempfile
-import home.telegram.aio as telegram
+import __py_include
+import homekit.telegram.aio as telegram
 
-from home.config import config
-from home.camera.esp32 import WebClient
-from home.util import Addr, send_datagram, stringify
+from homekit.config import config
+from homekit.camera.esp32 import WebClient
+from homekit.util import Addr, send_datagram, stringify
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from typing import Optional
 
diff --git a/src/gpiorelayd.py b/bin/gpiorelayd.py
index f1a9e57..1f4d2e2 100755
--- a/src/gpiorelayd.py
+++ b/bin/gpiorelayd.py
@@ -2,9 +2,10 @@
 import logging
 import os
 import sys
+import __py_include
 
-from home.config import config
-from home.relay.sunxi_h3_server import RelayServer
+from homekit.config import config
+from homekit.relay.sunxi_h3_server import RelayServer
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/inverter_bot.py b/bin/inverter_bot.py
index 1dd167e..fdfe436 100755
--- a/src/inverter_bot.py
+++ b/bin/inverter_bot.py
@@ -5,30 +5,31 @@ import datetime
 import json
 import itertools
 import sys
+import __py_include
 
 from inverterd import Format, InverterError
 from html import escape
 from typing import Optional, Tuple, Union
 
-from home.util import chunks
-from home.config import config, AppConfigUnit
-from home.telegram import bot
-from home.telegram.config import TelegramBotConfig, TelegramUserListType
-from home.inverter import (
+from homekit.util import chunks
+from homekit.config import config, AppConfigUnit
+from homekit.telegram import bot
+from homekit.telegram.config import TelegramBotConfig, TelegramUserListType
+from homekit.inverter import (
     wrapper_instance as inverter,
     beautify_table,
     InverterMonitor,
 )
-from home.inverter.types import (
+from homekit.inverter.types import (
     ChargingEvent,
     ACPresentEvent,
     BatteryState,
     ACMode,
     OutputSourcePriority
 )
-from home.database.inverter_time_formats import FormatDate
-from home.api.types import BotType
-from home.api import WebApiClient
+from homekit.database.inverter_time_formats import FormatDate
+from homekit.api.types import BotType
+from homekit.api import WebApiClient
 from telegram import ReplyKeyboardMarkup, InlineKeyboardMarkup, InlineKeyboardButton
 
 
diff --git a/src/inverter_mqtt_util.py b/bin/inverter_mqtt_util.py
index 791bf80..6003c62 100755
--- a/src/inverter_mqtt_util.py
+++ b/bin/inverter_mqtt_util.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
+import __py_include
+
 from argparse import ArgumentParser
-from home.config import config, app_config
-from home.mqtt import MqttWrapper, MqttNode
+from homekit.config import config
+from homekit.mqtt import MqttWrapper, MqttNode
 
 
 if __name__ == '__main__':
@@ -17,8 +19,8 @@ if __name__ == '__main__':
     node = MqttNode(node_id='inverter')
     module_kwargs = {}
     if mode == 'sender':
-        module_kwargs['status_poll_freq'] = int(app_config['poll_freq'])
-        module_kwargs['generation_poll_freq'] = int(app_config['generation_poll_freq'])
+        module_kwargs['status_poll_freq'] = int(config.app_config['poll_freq'])
+        module_kwargs['generation_poll_freq'] = int(config.app_config['generation_poll_freq'])
     node.load_module('inverter', **module_kwargs)
     mqtt.add_node(node)
 
diff --git a/src/inverterd_emulator.py b/bin/inverterd_emulator.py
index 8c4d0bd..371d955 100755
--- a/src/inverterd_emulator.py
+++ b/bin/inverterd_emulator.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 import logging
+import __py_include
 
-from home.inverter.emulator import InverterEmulator
+from homekit.inverter.emulator import InverterEmulator
 
 
 if __name__ == '__main__':
diff --git a/src/ipcam_server.py b/bin/ipcam_server.py
index a54cd35..211bc86 100755
--- a/src/ipcam_server.py
+++ b/bin/ipcam_server.py
@@ -5,15 +5,17 @@ import re
 import asyncio
 import time
 import shutil
-import home.telegram.aio as telegram
+import __py_include
+
+import homekit.telegram.aio as telegram
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from asyncio import Lock
 
-from home.config import config
-from home import http
-from home.database.sqlite import SQLiteBase
-from home.camera import util as camutil
+from homekit.config import config
+from homekit import http
+from homekit.database.sqlite import SQLiteBase
+from homekit.camera import util as camutil
 
 from enum import Enum
 from typing import Optional, Union, List, Tuple
diff --git a/src/mqtt_node_util.py b/bin/mqtt_node_util.py
index ce954ae..420a87e 100755
--- a/src/mqtt_node_util.py
+++ b/bin/mqtt_node_util.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 import os.path
+import __py_include
 
 from time import sleep
 from typing import Optional
 from argparse import ArgumentParser, ArgumentError
 
-from home.config import config
-from home.mqtt import MqttNode, MqttWrapper, get_mqtt_modules
-from home.mqtt import MqttNodesConfig
+from homekit.config import config
+from homekit.mqtt import MqttNode, MqttWrapper, get_mqtt_modules
+from homekit.mqtt import MqttNodesConfig
 
 mqtt_node: Optional[MqttNode] = None
 mqtt: Optional[MqttWrapper] = None
diff --git a/src/openwrt_log_analyzer.py b/bin/openwrt_log_analyzer.py
index 96023cd..5b14a2f 100755
--- a/src/openwrt_log_analyzer.py
+++ b/bin/openwrt_log_analyzer.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
-import home.telegram as telegram
+import __py_include
+import homekit.telegram as telegram
 
-from home.telegram.config import TelegramChatsConfig
-from home.util import validate_mac_address
+from homekit.telegram.config import TelegramChatsConfig
+from homekit.util import validate_mac_address
 from typing import Optional
-from home.config import config, AppConfigUnit
-from home.database import BotsDatabase, SimpleState
+from homekit.config import config, AppConfigUnit
+from homekit.database import BotsDatabase, SimpleState
 
 
 class OpenwrtLogAnalyzerConfig(AppConfigUnit):
diff --git a/src/openwrt_logger.py b/bin/openwrt_logger.py
index 82f11ac..ec67542 100755
--- a/src/openwrt_logger.py
+++ b/bin/openwrt_logger.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import os
+import __py_include
 
 from datetime import datetime
 from typing import Tuple, List, Optional
 from argparse import ArgumentParser
-from home.config import config, AppConfigUnit
-from home.database import SimpleState
-from home.api import WebApiClient
+from homekit.config import config, AppConfigUnit
+from homekit.database import SimpleState
+from homekit.api import WebApiClient
 
 
 class OpenwrtLoggerConfig(AppConfigUnit):
diff --git a/src/pio_build.py b/bin/pio_build.py
index 1916e5e..539df44 100644
--- a/src/pio_build.py
+++ b/bin/pio_build.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import __py_include
 
 if __name__ == '__main__':
     print('TODO')
\ No newline at end of file
diff --git a/src/pio_ini.py b/bin/pio_ini.py
index 920c3e5..34ad395 100755
--- a/src/pio_ini.py
+++ b/bin/pio_ini.py
@@ -2,11 +2,12 @@
 import os
 import yaml
 import re
+import __py_include
 
 from pprint import pprint
 from argparse import ArgumentParser, ArgumentError
-from home.pio import get_products, platformio_ini
-from home.pio.exceptions import ProductConfigNotFoundError
+from homekit.pio import get_products, platformio_ini
+from homekit.pio.exceptions import ProductConfigNotFoundError
 
 
 def get_config(product: str) -> dict:
diff --git a/src/polaris_kettle_bot.py b/bin/polaris_kettle_bot.py
index 80baef3..3a24fe0 100755
--- a/src/polaris_kettle_bot.py
+++ b/bin/polaris_kettle_bot.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import __py_include
 import logging
 import locale
 import queue
@@ -8,11 +9,11 @@ import time
 import threading
 import paho.mqtt.client as mqtt
 
-from home.telegram import bot
-from home.api.types import BotType
-from home.mqtt import Mqtt
-from home.config import config
-from home.util import chunks
+from homekit.telegram import bot
+from homekit.api.types import BotType
+from homekit.mqtt import Mqtt
+from homekit.config import config
+from homekit.util import chunks
 from syncleo import (
     Kettle,
     PowerType,
diff --git a/src/polaris_kettle_util.py b/bin/polaris_kettle_util.py
index 12c4388..4db0ed4 100755
--- a/src/polaris_kettle_util.py
+++ b/bin/polaris_kettle_util.py
@@ -4,12 +4,13 @@
 import logging
 import sys
 import paho.mqtt.client as mqtt
+import __py_include
 
 from typing import Optional
 from argparse import ArgumentParser
 from queue import SimpleQueue
-from home.mqtt import Mqtt
-from home.config import config
+from homekit.mqtt import Mqtt
+from homekit.config import config
 from syncleo import (
     Kettle,
     PowerType,
diff --git a/src/pump_bot.py b/bin/pump_bot.py
index 25f06fd..08d0dc6 100755
--- a/src/pump_bot.py
+++ b/bin/pump_bot.py
@@ -1,19 +1,21 @@
 #!/usr/bin/env python3
+import __py_include
+
 from enum import Enum
 from typing import Optional
 from telegram import ReplyKeyboardMarkup, User
 from time import time
 from datetime import datetime
 
-from home.config import config, is_development_mode
-from home.telegram import bot
-from home.telegram._botutil import user_any_name
-from home.relay.sunxi_h3_client import RelayClient
-from home.api.types import BotType
-from home.mqtt import MqttNode, MqttWrapper, MqttPayload
-from home.mqtt.module.relay import MqttPowerStatusPayload, MqttRelayModule
-from home.mqtt.module.temphum import MqttTemphumDataPayload
-from home.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
+from homekit.config import config, is_development_mode
+from homekit.telegram import bot
+from homekit.telegram._botutil import user_any_name
+from homekit.relay.sunxi_h3_client import RelayClient
+from homekit.api.types import BotType
+from homekit.mqtt import MqttNode, MqttWrapper, MqttPayload
+from homekit.mqtt.module.relay import MqttPowerStatusPayload, MqttRelayModule
+from homekit.mqtt.module.temphum import MqttTemphumDataPayload
+from homekit.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
 
 
 config.load_app('pump_bot')
diff --git a/src/pump_mqtt_bot.py b/bin/pump_mqtt_bot.py
index 4036d3a..aea1451 100755
--- a/src/pump_mqtt_bot.py
+++ b/bin/pump_mqtt_bot.py
@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
 import datetime
+import __py_include
 
 from enum import Enum
 from typing import Optional
 from telegram import ReplyKeyboardMarkup, User
 
-from home.config import config
-from home.telegram import bot
-from home.telegram._botutil import user_any_name
-from home.mqtt import MqttNode, MqttPayload
-from home.mqtt.module.relay import MqttRelayState
-from home.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
+from homekit.config import config
+from homekit.telegram import bot
+from homekit.telegram._botutil import user_any_name
+from homekit.mqtt import MqttNode, MqttPayload
+from homekit.mqtt.module.relay import MqttRelayState
+from homekit.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
 
 
 config.load_app('pump_mqtt_bot')
diff --git a/src/relay_mqtt_bot.py b/bin/relay_mqtt_bot.py
index 020dc08..1c1cc94 100755
--- a/src/relay_mqtt_bot.py
+++ b/bin/relay_mqtt_bot.py
@@ -1,18 +1,19 @@
 #!/usr/bin/env python3
 import sys
+import __py_include
 
 from enum import Enum
 from typing import Optional, Union
 from telegram import ReplyKeyboardMarkup
 from functools import partial
 
-from home.config import config, AppConfigUnit, Translation
-from home.telegram import bot
-from home.telegram.config import TelegramBotConfig
-from home.mqtt import MqttPayload, MqttNode, MqttWrapper, MqttModule
-from home.mqtt import MqttNodesConfig
-from home.mqtt.module.relay import MqttRelayModule, MqttRelayState
-from home.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
+from homekit.config import config, AppConfigUnit, Translation
+from homekit.telegram import bot
+from homekit.telegram.config import TelegramBotConfig
+from homekit.mqtt import MqttPayload, MqttNode, MqttWrapper, MqttModule
+from homekit.mqtt import MqttNodesConfig
+from homekit.mqtt.module.relay import MqttRelayModule, MqttRelayState
+from homekit.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
 
 
 if __name__ != '__main__':
diff --git a/src/relay_mqtt_http_proxy.py b/bin/relay_mqtt_http_proxy.py
index e13c04a..23938e1 100755
--- a/src/relay_mqtt_http_proxy.py
+++ b/bin/relay_mqtt_http_proxy.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 import logging
+import __py_include
 
-from home import http
-from home.config import config, AppConfigUnit
-from home.mqtt import MqttPayload, MqttWrapper, MqttNode, MqttModule, MqttNodesConfig
-from home.mqtt.module.relay import MqttRelayState, MqttRelayModule, MqttPowerStatusPayload
-from home.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
+from homekit import http
+from homekit.config import config, AppConfigUnit
+from homekit.mqtt import MqttPayload, MqttWrapper, MqttNode, MqttModule, MqttNodesConfig
+from homekit.mqtt.module.relay import MqttRelayState, MqttRelayModule, MqttPowerStatusPayload
+from homekit.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
 from typing import Optional, Union
 
 
diff --git a/src/sensors_bot.py b/bin/sensors_bot.py
index 441c212..c2b0070 100755
--- a/src/sensors_bot.py
+++ b/bin/sensors_bot.py
@@ -4,6 +4,7 @@ import socket
 import logging
 import re
 import gc
+import __py_include
 
 from io import BytesIO
 from typing import Optional
@@ -14,11 +15,11 @@ import matplotlib.ticker as mticker
 
 from telegram import ReplyKeyboardMarkup, InlineKeyboardMarkup, InlineKeyboardButton
 
-from home.config import config
-from home.telegram import bot
-from home.util import chunks, MySimpleSocketClient
-from home.api import WebApiClient
-from home.api.types import (
+from homekit.config import config
+from homekit.telegram import bot
+from homekit.util import chunks, MySimpleSocketClient
+from homekit.api import WebApiClient
+from homekit.api.types import (
     BotType,
     TemperatureSensorLocation
 )
diff --git a/src/sound_bot.py b/bin/sound_bot.py
index bc9edce..518151d 100755
--- a/src/sound_bot.py
+++ b/bin/sound_bot.py
@@ -2,21 +2,22 @@
 import logging
 import os
 import tempfile
+import __py_include
 
 from enum import Enum
 from datetime import datetime, timedelta
 from html import escape
 from typing import Optional, List, Dict, Tuple
 
-from home.config import config
-from home.api import WebApiClient
-from home.api.types import SoundSensorLocation, BotType
-from home.api.errors import ApiResponseError
-from home.media import SoundNodeClient, SoundRecordClient, SoundRecordFile, CameraNodeClient
-from home.soundsensor import SoundSensorServerGuardClient
-from home.util import Addr, chunks, filesize_fmt
+from homekit.config import config
+from homekit.api import WebApiClient
+from homekit.api.types import SoundSensorLocation, BotType
+from homekit.api.errors import ApiResponseError
+from homekit.media import SoundNodeClient, SoundRecordClient, SoundRecordFile, CameraNodeClient
+from homekit.soundsensor import SoundSensorServerGuardClient
+from homekit.util import Addr, chunks, filesize_fmt
 
-from home.telegram import bot
+from homekit.telegram import bot
 
 from telegram.error import TelegramError
 from telegram import ReplyKeyboardMarkup, InlineKeyboardMarkup, InlineKeyboardButton, User
diff --git a/src/sound_node.py b/bin/sound_node.py
index b0b4a67..90e6997 100755
--- a/src/sound_node.py
+++ b/bin/sound_node.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import os
+import __py_include
 
 from typing import Optional
 
-from home.config import config
-from home.audio import amixer
-from home.media import MediaNodeServer, SoundRecordStorage, SoundRecorder
-from home import http
+from homekit.config import config
+from homekit.audio import amixer
+from homekit.media import MediaNodeServer, SoundRecordStorage, SoundRecorder
+from homekit import http
 
 
 # This script must be run as root as it runs arecord.
diff --git a/src/sound_sensor_node.py b/bin/sound_sensor_node.py
index 404fdf4..39c3905 100755
--- a/src/sound_sensor_node.py
+++ b/bin/sound_sensor_node.py
@@ -2,10 +2,11 @@
 import logging
 import os
 import sys
+import __py_include
 
-from home.config import config
-from home.util import Addr
-from home.soundsensor import SoundSensorNode
+from homekit.config import config
+from homekit.util import Addr
+from homekit.soundsensor import SoundSensorNode
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sound_sensor_server.py b/bin/sound_sensor_server.py
index 3446b80..fd7ff5a 100755
--- a/src/sound_sensor_server.py
+++ b/bin/sound_sensor_server.py
@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
 import logging
 import threading
+import __py_include
 
 from time import sleep
 from typing import Optional, List, Dict, Tuple
 from functools import partial
-from home.config import config
-from home.util import Addr
-from home.api import WebApiClient, RequestParams
-from home.api.types import SoundSensorLocation
-from home.soundsensor import SoundSensorServer, SoundSensorHitHandler
-from home.media import MediaNodeType, SoundRecordClient, CameraRecordClient, RecordClient
+from homekit.config import config
+from homekit.util import Addr
+from homekit.api import WebApiClient, RequestParams
+from homekit.api.types import SoundSensorLocation
+from homekit.soundsensor import SoundSensorServer, SoundSensorHitHandler
+from homekit.media import MediaNodeType, SoundRecordClient, CameraRecordClient, RecordClient
 
 interrupted = False
 logger = logging.getLogger(__name__)
diff --git a/src/ssh_tunnels_config_util.py b/bin/ssh_tunnels_config_util.py
index 963c01b..d08a4f4 100755
--- a/src/ssh_tunnels_config_util.py
+++ b/bin/ssh_tunnels_config_util.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-
-from home.config import config
+import __py_include
+from homekit.config import config
 
 if __name__ == '__main__':
     config.load_app('ssh_tunnels_config_util')
diff --git a/src/temphum_mqtt_node.py b/bin/temphum_mqtt_node.py
index c3d1975..9ea436d 100755
--- a/src/temphum_mqtt_node.py
+++ b/bin/temphum_mqtt_node.py
@@ -2,12 +2,13 @@
 import asyncio
 import json
 import logging
+import __py_include
 
 from typing import Optional
 
-from home.config import config
-from home.temphum import SensorType, BaseSensor
-from home.temphum.i2c import create_sensor
+from homekit.config import config
+from homekit.temphum import SensorType, BaseSensor
+from homekit.temphum.i2c import create_sensor
 
 logger = logging.getLogger(__name__)
 sensor: Optional[BaseSensor] = None
diff --git a/src/temphum_mqtt_receiver.py b/bin/temphum_mqtt_receiver.py
index 2b30800..d0a378e 100755
--- a/src/temphum_mqtt_receiver.py
+++ b/bin/temphum_mqtt_receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 import paho.mqtt.client as mqtt
 import re
+import __py_include
 
-from home.config import config
-from home.mqtt import MqttWrapper, MqttNode
+from homekit.config import config
+from homekit.mqtt import MqttWrapper, MqttNode
 
 
 class MqttServer(Mqtt):
diff --git a/src/temphum_nodes_util.py b/bin/temphum_nodes_util.py
index c700ca8..aa46494 100755
--- a/src/temphum_nodes_util.py
+++ b/bin/temphum_nodes_util.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
-from home.mqtt.temphum import MqttTempHumNodes
+import __py_include
+
+from homekit.mqtt.temphum import MqttTempHumNodes
 
 if __name__ == '__main__':
     max_name_len = 0
diff --git a/src/temphum_smbus_util.py b/bin/temphum_smbus_util.py
index c06bacd..1cfaa84 100755
--- a/src/temphum_smbus_util.py
+++ b/bin/temphum_smbus_util.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
+import __py_include
+
 from argparse import ArgumentParser
-from home.temphum import SensorType
-from home.temphum.i2c import create_sensor
+from homekit.temphum import SensorType
+from homekit.temphum.i2c import create_sensor
 
 
 if __name__ == '__main__':
diff --git a/src/temphumd.py b/bin/temphumd.py
index c3d1975..9ea436d 100755
--- a/src/temphumd.py
+++ b/bin/temphumd.py
@@ -2,12 +2,13 @@
 import asyncio
 import json
 import logging
+import __py_include
 
 from typing import Optional
 
-from home.config import config
-from home.temphum import SensorType, BaseSensor
-from home.temphum.i2c import create_sensor
+from homekit.config import config
+from homekit.temphum import SensorType, BaseSensor
+from homekit.temphum.i2c import create_sensor
 
 logger = logging.getLogger(__name__)
 sensor: Optional[BaseSensor] = None
diff --git a/src/web_api.py b/bin/web_api.py
index 0aa994a..0e0fd0b 100755
--- a/src/web_api.py
+++ b/bin/web_api.py
@@ -2,16 +2,17 @@
 import asyncio
 import json
 import os
+import __py_include
 
 from datetime import datetime, timedelta
 
 from aiohttp import web
-from home import http
-from home.config import config, is_development_mode
-from home.database import BotsDatabase, SensorsDatabase, InverterDatabase
-from home.database.inverter_time_formats import *
-from home.api.types import BotType, TemperatureSensorLocation, SoundSensorLocation
-from home.media import SoundRecordStorage
+from homekit import http
+from homekit.config import config, is_development_mode
+from homekit.database import BotsDatabase, SensorsDatabase, InverterDatabase
+from homekit.database.inverter_time_formats import *
+from homekit.api.types import BotType, TemperatureSensorLocation, SoundSensorLocation
+from homekit.media import SoundRecordStorage
 
 
 def strptime_auto(s: str) -> datetime:
diff --git a/assets/mqtt_ca.crt b/misc/mqtt_ca.crt
index 045ae10..045ae10 100644
--- a/assets/mqtt_ca.crt
+++ b/misc/mqtt_ca.crt
diff --git a/src/__init__.py b/py_include/__init__.py
index e69de29..e69de29 100644
--- a/src/__init__.py
+++ b/py_include/__init__.py
diff --git a/src/home/__init__.py b/py_include/homekit/__init__.py
index e69de29..e69de29 100644
--- a/src/home/__init__.py
+++ b/py_include/homekit/__init__.py
diff --git a/src/home/api/__init__.py b/py_include/homekit/api/__init__.py
index d641f62..d641f62 100644
--- a/src/home/api/__init__.py
+++ b/py_include/homekit/api/__init__.py
diff --git a/src/home/api/__init__.pyi b/py_include/homekit/api/__init__.pyi
index 5b98161..5b98161 100644
--- a/src/home/api/__init__.pyi
+++ b/py_include/homekit/api/__init__.pyi
diff --git a/src/home/api/config.py b/py_include/homekit/api/config.py
index 00c1097..00c1097 100644
--- a/src/home/api/config.py
+++ b/py_include/homekit/api/config.py
diff --git a/src/home/api/errors/__init__.py b/py_include/homekit/api/errors/__init__.py
index efb06aa..efb06aa 100644
--- a/src/home/api/errors/__init__.py
+++ b/py_include/homekit/api/errors/__init__.py
diff --git a/src/home/api/errors/api_response_error.py b/py_include/homekit/api/errors/api_response_error.py
index 85d788b..85d788b 100644
--- a/src/home/api/errors/api_response_error.py
+++ b/py_include/homekit/api/errors/api_response_error.py
diff --git a/src/home/api/types/__init__.py b/py_include/homekit/api/types/__init__.py
index 9f27ff6..9f27ff6 100644
--- a/src/home/api/types/__init__.py
+++ b/py_include/homekit/api/types/__init__.py
diff --git a/src/home/api/types/types.py b/py_include/homekit/api/types/types.py
index 981e798..981e798 100644
--- a/src/home/api/types/types.py
+++ b/py_include/homekit/api/types/types.py
diff --git a/src/home/api/web_api_client.py b/py_include/homekit/api/web_api_client.py
index 15c1915..15c1915 100644
--- a/src/home/api/web_api_client.py
+++ b/py_include/homekit/api/web_api_client.py
diff --git a/src/home/audio/__init__.py b/py_include/homekit/audio/__init__.py
index e69de29..e69de29 100644
--- a/src/home/audio/__init__.py
+++ b/py_include/homekit/audio/__init__.py
diff --git a/src/home/audio/amixer.py b/py_include/homekit/audio/amixer.py
index 5133c97..5133c97 100644
--- a/src/home/audio/amixer.py
+++ b/py_include/homekit/audio/amixer.py
diff --git a/src/home/camera/__init__.py b/py_include/homekit/camera/__init__.py
index 626930b..626930b 100644
--- a/src/home/camera/__init__.py
+++ b/py_include/homekit/camera/__init__.py
diff --git a/src/home/camera/esp32.py b/py_include/homekit/camera/esp32.py
index fe6de0e..fe6de0e 100644
--- a/src/home/camera/esp32.py
+++ b/py_include/homekit/camera/esp32.py
diff --git a/src/home/camera/types.py b/py_include/homekit/camera/types.py
index de59022..de59022 100644
--- a/src/home/camera/types.py
+++ b/py_include/homekit/camera/types.py
diff --git a/src/home/camera/util.py b/py_include/homekit/camera/util.py
index 97f35aa..97f35aa 100644
--- a/src/home/camera/util.py
+++ b/py_include/homekit/camera/util.py
diff --git a/src/home/config/__init__.py b/py_include/homekit/config/__init__.py
index 2fa5214..2fa5214 100644
--- a/src/home/config/__init__.py
+++ b/py_include/homekit/config/__init__.py
diff --git a/src/home/config/_configs.py b/py_include/homekit/config/_configs.py
index 1628cba..1628cba 100644
--- a/src/home/config/_configs.py
+++ b/py_include/homekit/config/_configs.py
diff --git a/src/home/config/config.py b/py_include/homekit/config/config.py
index 7344386..7344386 100644
--- a/src/home/config/config.py
+++ b/py_include/homekit/config/config.py
diff --git a/src/home/database/__init__.py b/py_include/homekit/database/__init__.py
index b50cbce..b50cbce 100644
--- a/src/home/database/__init__.py
+++ b/py_include/homekit/database/__init__.py
diff --git a/src/home/database/__init__.pyi b/py_include/homekit/database/__init__.pyi
index 31aae5d..31aae5d 100644
--- a/src/home/database/__init__.pyi
+++ b/py_include/homekit/database/__init__.pyi
diff --git a/src/home/database/_base.py b/py_include/homekit/database/_base.py
index c01e62b..c01e62b 100644
--- a/src/home/database/_base.py
+++ b/py_include/homekit/database/_base.py
diff --git a/src/home/database/bots.py b/py_include/homekit/database/bots.py
index cde48b9..cde48b9 100644
--- a/src/home/database/bots.py
+++ b/py_include/homekit/database/bots.py
diff --git a/src/home/database/clickhouse.py b/py_include/homekit/database/clickhouse.py
index d0ec283..d0ec283 100644
--- a/src/home/database/clickhouse.py
+++ b/py_include/homekit/database/clickhouse.py
diff --git a/src/home/database/inverter.py b/py_include/homekit/database/inverter.py
index fc3f74f..fc3f74f 100644
--- a/src/home/database/inverter.py
+++ b/py_include/homekit/database/inverter.py
diff --git a/src/home/database/inverter_time_formats.py b/py_include/homekit/database/inverter_time_formats.py
index 7c37d30..7c37d30 100644
--- a/src/home/database/inverter_time_formats.py
+++ b/py_include/homekit/database/inverter_time_formats.py
diff --git a/src/home/database/mysql.py b/py_include/homekit/database/mysql.py
index fe97cd4..fe97cd4 100644
--- a/src/home/database/mysql.py
+++ b/py_include/homekit/database/mysql.py
diff --git a/src/home/database/sensors.py b/py_include/homekit/database/sensors.py
index 8155108..8155108 100644
--- a/src/home/database/sensors.py
+++ b/py_include/homekit/database/sensors.py
diff --git a/src/home/database/simple_state.py b/py_include/homekit/database/simple_state.py
index 2b8ebe7..2b8ebe7 100644
--- a/src/home/database/simple_state.py
+++ b/py_include/homekit/database/simple_state.py
diff --git a/src/home/database/sqlite.py b/py_include/homekit/database/sqlite.py
index 0af1f54..0af1f54 100644
--- a/src/home/database/sqlite.py
+++ b/py_include/homekit/database/sqlite.py
diff --git a/src/home/http/__init__.py b/py_include/homekit/http/__init__.py
index 6030e95..6030e95 100644
--- a/src/home/http/__init__.py
+++ b/py_include/homekit/http/__init__.py
diff --git a/src/home/http/http.py b/py_include/homekit/http/http.py
index 3e70751..3e70751 100644
--- a/src/home/http/http.py
+++ b/py_include/homekit/http/http.py
diff --git a/src/home/inverter/__init__.py b/py_include/homekit/inverter/__init__.py
index 8831ef3..8831ef3 100644
--- a/src/home/inverter/__init__.py
+++ b/py_include/homekit/inverter/__init__.py
diff --git a/src/home/inverter/config.py b/py_include/homekit/inverter/config.py
index e284dfe..e284dfe 100644
--- a/src/home/inverter/config.py
+++ b/py_include/homekit/inverter/config.py
diff --git a/src/home/inverter/emulator.py b/py_include/homekit/inverter/emulator.py
index e86b8bb..e86b8bb 100644
--- a/src/home/inverter/emulator.py
+++ b/py_include/homekit/inverter/emulator.py
diff --git a/src/home/inverter/inverter_wrapper.py b/py_include/homekit/inverter/inverter_wrapper.py
index df2c2fc..df2c2fc 100644
--- a/src/home/inverter/inverter_wrapper.py
+++ b/py_include/homekit/inverter/inverter_wrapper.py
diff --git a/src/home/inverter/monitor.py b/py_include/homekit/inverter/monitor.py
index 86f75ac..86f75ac 100644
--- a/src/home/inverter/monitor.py
+++ b/py_include/homekit/inverter/monitor.py
diff --git a/src/home/inverter/types.py b/py_include/homekit/inverter/types.py
index 57021f1..57021f1 100644
--- a/src/home/inverter/types.py
+++ b/py_include/homekit/inverter/types.py
diff --git a/src/home/inverter/util.py b/py_include/homekit/inverter/util.py
index a577e6a..a577e6a 100644
--- a/src/home/inverter/util.py
+++ b/py_include/homekit/inverter/util.py
diff --git a/src/home/media/__init__.py b/py_include/homekit/media/__init__.py
index 6923105..6923105 100644
--- a/src/home/media/__init__.py
+++ b/py_include/homekit/media/__init__.py
diff --git a/src/home/media/__init__.pyi b/py_include/homekit/media/__init__.pyi
index 77c2176..77c2176 100644
--- a/src/home/media/__init__.pyi
+++ b/py_include/homekit/media/__init__.pyi
diff --git a/src/home/media/node_client.py b/py_include/homekit/media/node_client.py
index eb39898..eb39898 100644
--- a/src/home/media/node_client.py
+++ b/py_include/homekit/media/node_client.py
diff --git a/src/home/media/node_server.py b/py_include/homekit/media/node_server.py
index 5d0803c..5d0803c 100644
--- a/src/home/media/node_server.py
+++ b/py_include/homekit/media/node_server.py
diff --git a/src/home/media/record.py b/py_include/homekit/media/record.py
index cd7447a..cd7447a 100644
--- a/src/home/media/record.py
+++ b/py_include/homekit/media/record.py
diff --git a/src/home/media/record_client.py b/py_include/homekit/media/record_client.py
index 322495c..322495c 100644
--- a/src/home/media/record_client.py
+++ b/py_include/homekit/media/record_client.py
diff --git a/src/home/media/storage.py b/py_include/homekit/media/storage.py
index dd74ff8..dd74ff8 100644
--- a/src/home/media/storage.py
+++ b/py_include/homekit/media/storage.py
diff --git a/src/home/media/types.py b/py_include/homekit/media/types.py
index acbc291..acbc291 100644
--- a/src/home/media/types.py
+++ b/py_include/homekit/media/types.py
diff --git a/src/home/mqtt/__init__.py b/py_include/homekit/mqtt/__init__.py
index 707d59c..707d59c 100644
--- a/src/home/mqtt/__init__.py
+++ b/py_include/homekit/mqtt/__init__.py
diff --git a/src/home/mqtt/_config.py b/py_include/homekit/mqtt/_config.py
index 9ba9443..9ba9443 100644
--- a/src/home/mqtt/_config.py
+++ b/py_include/homekit/mqtt/_config.py
diff --git a/src/home/mqtt/_module.py b/py_include/homekit/mqtt/_module.py
index 80f27bb..80f27bb 100644
--- a/src/home/mqtt/_module.py
+++ b/py_include/homekit/mqtt/_module.py
diff --git a/src/home/mqtt/_mqtt.py b/py_include/homekit/mqtt/_mqtt.py
index 746ae2e..fb35a24 100644
--- a/src/home/mqtt/_mqtt.py
+++ b/py_include/homekit/mqtt/_mqtt.py
@@ -45,7 +45,7 @@ class Mqtt:
             '..',
             '..',
             '..',
-            'assets',
+            'misc',
             'mqtt_ca.crt'
         ))
         self._client.tls_set(ca_certs=ca_certs,
diff --git a/src/home/mqtt/_node.py b/py_include/homekit/mqtt/_node.py
index 4e259a4..4e259a4 100644
--- a/src/home/mqtt/_node.py
+++ b/py_include/homekit/mqtt/_node.py
diff --git a/src/home/mqtt/_payload.py b/py_include/homekit/mqtt/_payload.py
index 58eeae3..58eeae3 100644
--- a/src/home/mqtt/_payload.py
+++ b/py_include/homekit/mqtt/_payload.py
diff --git a/src/home/mqtt/_util.py b/py_include/homekit/mqtt/_util.py
index 390d463..390d463 100644
--- a/src/home/mqtt/_util.py
+++ b/py_include/homekit/mqtt/_util.py
diff --git a/src/home/mqtt/_wrapper.py b/py_include/homekit/mqtt/_wrapper.py
index 3c2774c..3c2774c 100644
--- a/src/home/mqtt/_wrapper.py
+++ b/py_include/homekit/mqtt/_wrapper.py
diff --git a/src/home/mqtt/module/diagnostics.py b/py_include/homekit/mqtt/module/diagnostics.py
index 5db5e99..5db5e99 100644
--- a/src/home/mqtt/module/diagnostics.py
+++ b/py_include/homekit/mqtt/module/diagnostics.py
diff --git a/src/home/mqtt/module/inverter.py b/py_include/homekit/mqtt/module/inverter.py
index d927a06..29bde0a 100644
--- a/src/home/mqtt/module/inverter.py
+++ b/py_include/homekit/mqtt/module/inverter.py
@@ -11,7 +11,7 @@ from .._module import MqttModule
 from .._node import MqttNode
 from .._payload import MqttPayload, bit_field
 try:
-    from home.database import InverterDatabase
+    from homekit.database import InverterDatabase
 except:
     pass
 
diff --git a/src/home/mqtt/module/ota.py b/py_include/homekit/mqtt/module/ota.py
index cd34332..cd34332 100644
--- a/src/home/mqtt/module/ota.py
+++ b/py_include/homekit/mqtt/module/ota.py
diff --git a/src/home/mqtt/module/relay.py b/py_include/homekit/mqtt/module/relay.py
index e968031..e968031 100644
--- a/src/home/mqtt/module/relay.py
+++ b/py_include/homekit/mqtt/module/relay.py
diff --git a/src/home/mqtt/module/temphum.py b/py_include/homekit/mqtt/module/temphum.py
index fd02cca..fd02cca 100644
--- a/src/home/mqtt/module/temphum.py
+++ b/py_include/homekit/mqtt/module/temphum.py
diff --git a/src/home/pio/__init__.py b/py_include/homekit/pio/__init__.py
index 7216bc4..7216bc4 100644
--- a/src/home/pio/__init__.py
+++ b/py_include/homekit/pio/__init__.py
diff --git a/src/home/pio/exceptions.py b/py_include/homekit/pio/exceptions.py
index a6afd20..a6afd20 100644
--- a/src/home/pio/exceptions.py
+++ b/py_include/homekit/pio/exceptions.py
diff --git a/src/home/pio/products.py b/py_include/homekit/pio/products.py
index 388da03..388da03 100644
--- a/src/home/pio/products.py
+++ b/py_include/homekit/pio/products.py
diff --git a/src/home/relay/__init__.py b/py_include/homekit/relay/__init__.py
index 406403d..406403d 100644
--- a/src/home/relay/__init__.py
+++ b/py_include/homekit/relay/__init__.py
diff --git a/src/home/relay/__init__.pyi b/py_include/homekit/relay/__init__.pyi
index 7a4a2f4..7a4a2f4 100644
--- a/src/home/relay/__init__.pyi
+++ b/py_include/homekit/relay/__init__.pyi
diff --git a/src/home/relay/sunxi_h3_client.py b/py_include/homekit/relay/sunxi_h3_client.py
index 8c8d6c4..8c8d6c4 100644
--- a/src/home/relay/sunxi_h3_client.py
+++ b/py_include/homekit/relay/sunxi_h3_client.py
diff --git a/src/home/relay/sunxi_h3_server.py b/py_include/homekit/relay/sunxi_h3_server.py
index 1f33969..1f33969 100644
--- a/src/home/relay/sunxi_h3_server.py
+++ b/py_include/homekit/relay/sunxi_h3_server.py
diff --git a/src/home/soundsensor/__init__.py b/py_include/homekit/soundsensor/__init__.py
index 30052f8..30052f8 100644
--- a/src/home/soundsensor/__init__.py
+++ b/py_include/homekit/soundsensor/__init__.py
diff --git a/src/home/soundsensor/__init__.pyi b/py_include/homekit/soundsensor/__init__.pyi
index cb34972..cb34972 100644
--- a/src/home/soundsensor/__init__.pyi
+++ b/py_include/homekit/soundsensor/__init__.pyi
diff --git a/src/home/soundsensor/node.py b/py_include/homekit/soundsensor/node.py
index 292452f..292452f 100644
--- a/src/home/soundsensor/node.py
+++ b/py_include/homekit/soundsensor/node.py
diff --git a/src/home/soundsensor/server.py b/py_include/homekit/soundsensor/server.py
index a627390..a627390 100644
--- a/src/home/soundsensor/server.py
+++ b/py_include/homekit/soundsensor/server.py
diff --git a/src/home/soundsensor/server_client.py b/py_include/homekit/soundsensor/server_client.py
index 7eef996..7eef996 100644
--- a/src/home/soundsensor/server_client.py
+++ b/py_include/homekit/soundsensor/server_client.py
diff --git a/src/home/telegram/__init__.py b/py_include/homekit/telegram/__init__.py
index a68dae1..a68dae1 100644
--- a/src/home/telegram/__init__.py
+++ b/py_include/homekit/telegram/__init__.py
diff --git a/src/home/telegram/_botcontext.py b/py_include/homekit/telegram/_botcontext.py
index a143bfe..a143bfe 100644
--- a/src/home/telegram/_botcontext.py
+++ b/py_include/homekit/telegram/_botcontext.py
diff --git a/src/home/telegram/_botdb.py b/py_include/homekit/telegram/_botdb.py
index 9e9cf94..4e1aec0 100644
--- a/src/home/telegram/_botdb.py
+++ b/py_include/homekit/telegram/_botdb.py
@@ -1,4 +1,4 @@
-from home.database.sqlite import SQLiteBase
+from homekit.database.sqlite import SQLiteBase
 
 
 class BotDatabase(SQLiteBase):
diff --git a/src/home/telegram/_botlang.py b/py_include/homekit/telegram/_botlang.py
index f5f85bb..f5f85bb 100644
--- a/src/home/telegram/_botlang.py
+++ b/py_include/homekit/telegram/_botlang.py
diff --git a/src/home/telegram/_botutil.py b/py_include/homekit/telegram/_botutil.py
index b551a55..111a704 100644
--- a/src/home/telegram/_botutil.py
+++ b/py_include/homekit/telegram/_botutil.py
@@ -3,9 +3,9 @@ import traceback
 
 from html import escape
 from telegram import User
-from home.api import WebApiClient as APIClient
-from home.api.types import BotType
-from home.api.errors import ApiResponseError
+from homekit.api import WebApiClient as APIClient
+from homekit.api.types import BotType
+from homekit.api.errors import ApiResponseError
 
 _logger = logging.getLogger(__name__)
 
diff --git a/src/home/telegram/aio.py b/py_include/homekit/telegram/aio.py
index fc87c1c..fc87c1c 100644
--- a/src/home/telegram/aio.py
+++ b/py_include/homekit/telegram/aio.py
diff --git a/src/home/telegram/bot.py b/py_include/homekit/telegram/bot.py
index e6ebc6e..2e33bea 100644
--- a/src/home/telegram/bot.py
+++ b/py_include/homekit/telegram/bot.py
@@ -20,9 +20,9 @@ from telegram.ext import (
 from telegram.ext.filters import BaseFilter
 from telegram.error import TimedOut
 
-from home.config import config
-from home.api import WebApiClient
-from home.api.types import BotType
+from homekit.config import config
+from homekit.api import WebApiClient
+from homekit.api.types import BotType
 
 from ._botlang import lang, languages
 from ._botdb import BotDatabase
diff --git a/src/home/telegram/config.py b/py_include/homekit/telegram/config.py
index 4c7d74b..4c7d74b 100644
--- a/src/home/telegram/config.py
+++ b/py_include/homekit/telegram/config.py
diff --git a/src/home/telegram/telegram.py b/py_include/homekit/telegram/telegram.py
index f42363e..f42363e 100644
--- a/src/home/telegram/telegram.py
+++ b/py_include/homekit/telegram/telegram.py
diff --git a/src/home/temphum/__init__.py b/py_include/homekit/temphum/__init__.py
index 46d14e6..46d14e6 100644
--- a/src/home/temphum/__init__.py
+++ b/py_include/homekit/temphum/__init__.py
diff --git a/src/home/temphum/base.py b/py_include/homekit/temphum/base.py
index 602cab7..602cab7 100644
--- a/src/home/temphum/base.py
+++ b/py_include/homekit/temphum/base.py
diff --git a/src/home/temphum/i2c.py b/py_include/homekit/temphum/i2c.py
index 7d8e2e3..7d8e2e3 100644
--- a/src/home/temphum/i2c.py
+++ b/py_include/homekit/temphum/i2c.py
diff --git a/src/home/util.py b/py_include/homekit/util.py
index 11e7116..11e7116 100644
--- a/src/home/util.py
+++ b/py_include/homekit/util.py
diff --git a/pyA20/__init__.pyi b/py_include/pyA20/__init__.pyi
index e69de29..e69de29 100644
--- a/pyA20/__init__.pyi
+++ b/py_include/pyA20/__init__.pyi
diff --git a/pyA20/gpio/connector.pyi b/py_include/pyA20/gpio/connector.pyi
index 12b2b6e..12b2b6e 100644
--- a/pyA20/gpio/connector.pyi
+++ b/py_include/pyA20/gpio/connector.pyi
diff --git a/pyA20/gpio/gpio.pyi b/py_include/pyA20/gpio/gpio.pyi
index 225fcbe..225fcbe 100644
--- a/pyA20/gpio/gpio.pyi
+++ b/py_include/pyA20/gpio/gpio.pyi
diff --git a/pyA20/gpio/port.pyi b/py_include/pyA20/gpio/port.pyi
index 17f69fe..17f69fe 100644
--- a/pyA20/gpio/port.pyi
+++ b/py_include/pyA20/gpio/port.pyi
diff --git a/pyA20/port.pyi b/py_include/pyA20/port.pyi
index e69de29..e69de29 100644
--- a/pyA20/port.pyi
+++ b/py_include/pyA20/port.pyi
diff --git a/src/syncleo/__init__.py b/py_include/syncleo/__init__.py
index 32563a5..32563a5 100644
--- a/src/syncleo/__init__.py
+++ b/py_include/syncleo/__init__.py
diff --git a/src/syncleo/kettle.py b/py_include/syncleo/kettle.py
index d6e0dd6..d6e0dd6 100644
--- a/src/syncleo/kettle.py
+++ b/py_include/syncleo/kettle.py
diff --git a/src/syncleo/protocol.py b/py_include/syncleo/protocol.py
index 36a1a8f..36a1a8f 100644
--- a/src/syncleo/protocol.py
+++ b/py_include/syncleo/protocol.py
diff --git a/systemd/camera_node.service b/systemd/camera_node.service
index 0de3cc1..83471bd 100644
--- a/systemd/camera_node.service
+++ b/systemd/camera_node.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/camera_node.py
+ExecStart=/home/user/homekit/bin/camera_node.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/camera_node@.service b/systemd/camera_node@.service
index 414881e..a272002 100644
--- a/systemd/camera_node@.service
+++ b/systemd/camera_node@.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/camera_node.py --config /home/user/.config/camera_node.%i.yaml
+ExecStart=/home/user/homekit/bin/camera_node.py --config /home/user/.config/camera_node.%i.yaml
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/esp32cam_capture_diff_node.service b/systemd/esp32cam_capture_diff_node.service
index ecc4861..a742edc 100644
--- a/systemd/esp32cam_capture_diff_node.service
+++ b/systemd/esp32cam_capture_diff_node.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/esp32cam_capture_diff_node.py
+ExecStart=/home/user/homekit/bin/esp32cam_capture_diff_node.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/gpiorelayd@.service b/systemd/gpiorelayd@.service
index 0cc0582..a3a8356 100644
--- a/systemd/gpiorelayd@.service
+++ b/systemd/gpiorelayd@.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=root
 Group=root
 Restart=on-failure
-ExecStart=/home/user/homekit/src/gpiorelayd.py -c /etc/gpiorelayd.conf.d/%i.toml
+ExecStart=/home/user/homekit/bin/gpiorelayd.py -c /etc/gpiorelayd.conf.d/%i.toml
 WorkingDirectory=/root
 
 [Install]
diff --git a/systemd/inverter_bot.service b/systemd/inverter_bot.service
index 96612ae..c5d4aec 100644
--- a/systemd/inverter_bot.service
+++ b/systemd/inverter_bot.service
@@ -6,7 +6,7 @@ After=inverterd.service
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/inverter_bot.py
+ExecStart=/home/user/homekit/bin/inverter_bot.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/inverter_mqtt_receiver.service b/systemd/inverter_mqtt_receiver.service
index fedf11f..88f9169 100644
--- a/systemd/inverter_mqtt_receiver.service
+++ b/systemd/inverter_mqtt_receiver.service
@@ -6,7 +6,7 @@ After=clickhouse-server.service
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/inverter_mqtt_util.py receiver
+ExecStart=/home/user/homekit/bin/inverter_mqtt_util.py receiver
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/inverter_mqtt_sender.service b/systemd/inverter_mqtt_sender.service
index 34272bb..bf6ab61 100644
--- a/systemd/inverter_mqtt_sender.service
+++ b/systemd/inverter_mqtt_sender.service
@@ -6,7 +6,7 @@ After=inverterd.service
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/inverter_mqtt_util.py sender
+ExecStart=/home/user/homekit/bin/inverter_mqtt_util.py sender
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/ipcam_server.service b/systemd/ipcam_server.service
index 07ac95f..e6f8918 100644
--- a/systemd/ipcam_server.service
+++ b/systemd/ipcam_server.service
@@ -7,7 +7,7 @@ User=user
 Group=user
 Restart=always
 RestartSec=10
-ExecStart=/home/user/homekit/src/ipcam_server.py
+ExecStart=/home/user/homekit/bin/ipcam_server.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/polaris_kettle_bot.service b/systemd/polaris_kettle_bot.service
index f91ed60..86bb293 100644
--- a/systemd/polaris_kettle_bot.service
+++ b/systemd/polaris_kettle_bot.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/polaris_kettle_bot.py
+ExecStart=/home/user/homekit/bin/polaris_kettle_bot.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/pump_bot.service b/systemd/pump_bot.service
index dd8a46b..b59f5b9 100644
--- a/systemd/pump_bot.service
+++ b/systemd/pump_bot.service
@@ -6,7 +6,7 @@ After=gpiorelayd.service
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/pump_bot.py
+ExecStart=/home/user/homekit/bin/pump_bot.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/pump_mqtt_bot.service b/systemd/pump_mqtt_bot.service
index 95f9419..6c72cbf 100644
--- a/systemd/pump_mqtt_bot.service
+++ b/systemd/pump_mqtt_bot.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/pump_mqtt_bot.py
+ExecStart=/home/user/homekit/bin/pump_mqtt_bot.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/relay_mqtt_bot.service b/systemd/relay_mqtt_bot.service
index 93696ac..3bac158 100644
--- a/systemd/relay_mqtt_bot.service
+++ b/systemd/relay_mqtt_bot.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/relay_mqtt_bot.py
+ExecStart=/home/user/homekit/bin/relay_mqtt_bot.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/relay_mqtt_http_proxy.service b/systemd/relay_mqtt_http_proxy.service
index 316a920..8301d52 100644
--- a/systemd/relay_mqtt_http_proxy.service
+++ b/systemd/relay_mqtt_http_proxy.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/relay_mqtt_http_proxy.py
+ExecStart=/home/user/homekit/bin/relay_mqtt_http_proxy.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/sensors_bot.service b/systemd/sensors_bot.service
index 50128b3..2470d92 100644
--- a/systemd/sensors_bot.service
+++ b/systemd/sensors_bot.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/sensors_bot.py
+ExecStart=/home/user/homekit/bin/sensors_bot.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/sound_bot.service b/systemd/sound_bot.service
index 51a9e0f..e0b5500 100644
--- a/systemd/sound_bot.service
+++ b/systemd/sound_bot.service
@@ -6,7 +6,7 @@ After=network-online.target
 Restart=on-failure
 User=user
 WorkingDirectory=/home/user
-ExecStart=/home/user/homekit/src/sound_bot.py
+ExecStart=/home/user/homekit/bin/sound_bot.py
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/sound_node.service b/systemd/sound_node.service
index e3e3afd..a14ec1f 100644
--- a/systemd/sound_node.service
+++ b/systemd/sound_node.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=root
 Group=root
 Restart=on-failure
-ExecStart=/home/user/homekit/src/sound_node.py --config /etc/sound_node.toml
+ExecStart=/home/user/homekit/bin/sound_node.py --config /etc/sound_node.toml
 WorkingDirectory=/root
 
 [Install]
diff --git a/systemd/sound_sensor_node.service b/systemd/sound_sensor_node.service
index d10f976..dfc2ecd 100644
--- a/systemd/sound_sensor_node.service
+++ b/systemd/sound_sensor_node.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=root
 Group=root
 Restart=on-failure
-ExecStart=/home/user/homekit/src/sound_sensor_node.py --config /etc/sound_sensor_node.toml
+ExecStart=/home/user/homekit/bin/sound_sensor_node.py --config /etc/sound_sensor_node.toml
 WorkingDirectory=/root
 
 [Install]
diff --git a/systemd/sound_sensor_server.service b/systemd/sound_sensor_server.service
index 0133e53..5ab08cd 100644
--- a/systemd/sound_sensor_server.service
+++ b/systemd/sound_sensor_server.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=user
 Group=user
 Restart=on-failure
-ExecStart=/home/user/homekit/src/sound_sensor_server.py
+ExecStart=/home/user/homekit/bin/sound_sensor_server.py
 WorkingDirectory=/home/user
 
 [Install]
diff --git a/systemd/temphumd.service b/systemd/temphumd.service
index 1da9617..dd5ec55 100644
--- a/systemd/temphumd.service
+++ b/systemd/temphumd.service
@@ -4,7 +4,7 @@ After=network-online.target
 
 [Service]
 Restart=on-failure
-ExecStart=/home/user/homekit/src/temphumd.py --config /etc/temphumd.toml
+ExecStart=/home/user/homekit/bin/temphumd.py --config /etc/temphumd.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/temphumd@.service b/systemd/temphumd@.service
index d1c840d..7b1b11e 100644
--- a/systemd/temphumd@.service
+++ b/systemd/temphumd@.service
@@ -4,7 +4,7 @@ After=network-online.target
 
 [Service]
 Restart=on-failure
-ExecStart=/home/user/homekit/src/temphumd.py --config /etc/temphumd-%i.toml
+ExecStart=/home/user/homekit/bin/temphumd.py --config /etc/temphumd-%i.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/test/__init__.py b/test/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/test/__init__.py
+++ /dev/null
diff --git a/test/test.py b/test/test.py
index 7ea37e6..413c25c 100755
--- a/test/test.py
+++ b/test/test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from home.relay import RelayClient
+from homekit.relay import RelayClient
 
 
 if __name__ == '__main__':
diff --git a/test/test_stopwatch.py b/test/test_stopwatch.py
index 6ff2c0e..9dd7762 100755
--- a/test/test_stopwatch.py
+++ b/test/test_stopwatch.py
@@ -1,4 +1,4 @@
-from home.util import Stopwatch, StopwatchError
+from homekit.util import Stopwatch, StopwatchError
 from time import sleep