diff --git a/Makefile b/Makefile
index 8a440b353bb0514f7b053ab3460e6b60d25a3440..184d0989eca7a0d0ce1fb189dc196dd3292dd14b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SYSTEMDDIR	= $(DESTDIR)$(PREFIX)/lib/systemd/system
 INCLUDEDIR      = $(DESTDIR)$(PREFIX)/include
 LIBINSTALLDIR   = $(DESTDIR)$(PREFIX)/lib64
 LOGSAVEDIR	= $(DESTDIR)$(VARDIR)/log/sysSentry
-LOGROTEDIR	= $(DESTDIR)$(ETCDIR)/logrotate.d
+LOGROTEDIR	= $(DESTDIR)$(ETCDIR)/logrotate-sysSentry.conf
 
 SRCVERSION = $(shell git rev-parse --short HEAD 2>/dev/null)
 SHELL = /bin/bash
@@ -25,7 +25,11 @@ PYBIN	= $(shell which python3)
 PYNAME	= $(shell ls /usr/lib |grep -E '^python'| sort -V | tail -n1)
 PYDIR	= $(DESTDIR)$(PREFIX)/lib/$(PYNAME)/site-packages
 
-ifeq ($(shell uname -r | grep -q "4.19" && echo 1 || echo 0), 1)
+PYTHON_VERSION := $(shell $(PYBIN) --version 2>&1 | awk '{print $$2}'| cut -d '.' -f 1,2)
+PKGVER := syssentry-$(VERSION)-py$(PYTHON_VERSION)
+PKGVEREGG := syssentry-$(VERSION)-py$(PYTHON_VERSION).egg-info
+
+ifeq ($(shell rpm -qa | grep "kernel-4.19" && echo 1 || echo 0), 1)
 	KERNEL_IS_4_19 := 1
 else
 	KERNEL_IS_4_19 := 0
@@ -51,15 +55,15 @@ dirs:
 sentry:
 	@echo "Kernel version is $(shell uname -r)"
 	@if [ $(KERNEL_IS_4_19) -eq 1 ]; then \
-		cd $(CURSRCDIR)/sentryCollector/ebpf_collector/ && make; \
+		cd $(CURSRCDIR)/c/ebpf_collector/ && make; \
 	else \
         	echo "Kernel is not 4.19, skipping building ebpf_collector"; \
 	fi
 
 isentry:
-	cd $(CURSRCDIR) && $(PYBIN) setup.py install -O1 --root=build/ --record=SENTRY_FILES
-	find $(CURSRCDIR)/build/ -type d -name '__pycache__' -exec rm -rf {} +
-	install -m 600 $(CURCONFIGDIR)/logrotate $(LOGROTEDIR)/sysSentry
+	cd $(CURSRCDIR)/python/ && $(PYBIN) setup.py install -O1 --root=build/ --record=SENTRY_FILES
+	find $(CURSRCDIR)/python/build/ -type d -name '__pycache__' -exec rm -rf {} +
+	install -m 600 $(CURCONFIGDIR)/logrotate-sysSentry.conf $(LOGROTEDIR)/
 	install -m 600 $(CURCONFIGDIR)/inspect.conf $(ETCDIR)/sysSentry/
 	install -m 600 $(CURCONFIGDIR)/xalarm.conf $(ETCDIR)/sysSentry/
 	install -m 600 $(CURCONFIGDIR)/collector.conf $(ETCDIR)/sysSentry/
@@ -69,26 +73,35 @@ isentry:
 	install -d -m 550 $(PYDIR)/syssentry
 	install -d -m 550 $(PYDIR)/xalarm
 	install -d -m 550 $(PYDIR)/sentryCollector
-	install -m 550 src/build/usr/local/lib/$(PYNAME)/site-packages/syssentry/* $(PYDIR)/syssentry
-	install -m 550 src/build/usr/local/lib/$(PYNAME)/site-packages/xalarm/* $(PYDIR)/xalarm
-	install -m 550 libs/pyxalarm/register_xalarm.py $(PYDIR)/xalarm
-	install -m 550 src/build/usr/local/lib/$(PYNAME)/site-packages/sentryCollector/* $(PYDIR)/sentryCollector
-	install -m 550 $(CURSRCDIR)/syssentry/sentryctl $(BINDIR)
-	install -m 550 $(CURSRCDIR)/build/usr/local/bin/syssentry $(BINDIR)
-	install -m 550 $(CURSRCDIR)/build/usr/local/bin/xalarmd $(BINDIR)
-	install -m 550 $(CURSRCDIR)/build/usr/local/bin/sentryCollector $(BINDIR)
+	install -d -m 550 $(PYDIR)/$(PKGVEREGG)
+	install -m 550 src/python/build/usr/local/lib/$(PYNAME)/site-packages/syssentry/* $(PYDIR)/syssentry
+	install -m 550 src/python/build/usr/local/lib/$(PYNAME)/site-packages/xalarm/* $(PYDIR)/xalarm
+	install -m 550 src/python/xalarm/register_xalarm.py $(PYDIR)/xalarm
+	install -m 550 src/python/build/usr/local/lib/$(PYNAME)/site-packages/sentryCollector/* $(PYDIR)/sentryCollector
+	install -m 550 src/python/build/usr/local/lib/$(PYNAME)/site-packages/$(PKGVEREGG)/* $(PYDIR)/$(PKGVEREGG)
+	install -m 550 $(CURSRCDIR)/python/syssentry/sentryctl $(BINDIR)
+	install -m 550 $(CURSRCDIR)/python/build/usr/local/bin/syssentry $(BINDIR)
+	install -m 550 $(CURSRCDIR)/python/build/usr/local/bin/xalarmd $(BINDIR)
+	install -m 550 $(CURSRCDIR)/python/build/usr/local/bin/sentryCollector $(BINDIR)
 	@if [ -f "$(CURSRCDIR)/sentryCollector/ebpf_collector/ebpf_collector" ]; then \
 		install -m 550 $(CURSRCDIR)/sentryCollector/ebpf_collector/ebpf_collector $(BINDIR); \
 	fi
 
+	# ai_block_io
+	install -d -m 700 $(PYDIR)/sentryPlugins/ai_block_io
+	install -m 550 $(CURSRCDIR)/python/build/usr/local/bin/ai_block_io $(BINDIR)
+	install -m 550 src/python/build/usr/local/lib/$(PYNAME)/site-packages/sentryPlugins/ai_block_io/* $(PYDIR)/sentryPlugins/ai_block_io
+	install -m 600 $(CURCONFIGDIR)/plugins/ai_block_io.ini $(ETCDIR)/sysSentry/plugins
+	install -m 600 $(CURCONFIGDIR)/tasks/ai_block_io.mod $(ETCDIR)/sysSentry/tasks
+
 lib:
-	cd $(CURLIBDIR) && cmake . -DXD_INSTALL_BINDIR=$(LIBINSTALLDIR) -B build
-	cd $(CURLIBDIR)/build && make
+	cd $(CURSRCDIR)/libso && cmake . -DXD_INSTALL_BINDIR=$(LIBINSTALLDIR) -B build
+	cd $(CURSRCDIR)/libso/build && make
 
 ilib:
-	cd $(CURLIBDIR)/build && make install
+	cd $(CURSRCDIR)/libso/build && make install
 	install -d -m 644 $(INCLUDEDIR)/xalarm
-	install -m 644 $(CURLIBDIR)/libxalarm/register_xalarm.h $(INCLUDEDIR)/xalarm/
+	install -m 644 $(CURSRCDIR)/libso/xalarm/register_xalarm.h $(INCLUDEDIR)/xalarm/
 
 
 clean-install:
@@ -108,11 +121,13 @@ clean: clean-install
 	rm -rf $(LIBINSTALLDIR)/libxalarm.so
 	rm -rf $(INCLUDEDIR)/xalarm
 	rm -rf $(ETCDIR)/sysSentry
-	rm -rf $(LOGROTEDIR)/sysSentry
+	rm -rf $(LOGROTEDIR)/
 	rm -rf $(LOGSAVEDIR)/sysSentry
 	rm -rf $(PYDIR)/syssentry
 	rm -rf $(PYDIR)/xalarm
 	rm -rf $(PYDIR)/sentryCollector
+	rm -rf $(PYDIR)/$(PKGVEREGG)
+	rm -rf $(PYDIR)/sentryPlugins
 	rm -rf $(SYSTEMDDIR)/sysSentry.service
 	rm -rf $(SYSTEMDDIR)/xalarmd.service
 	rm -rf $(SYSTEMDDIR)/sentryCollector.service