diff --git a/casadm/Makefile b/casadm/Makefile
index eac2cc1..3a2e18e 100644
--- a/casadm/Makefile
+++ b/casadm/Makefile
@@ -5,7 +5,6 @@
 
 PWD:=$(shell pwd)
 MODULESDIR:=$(PWD)/../modules
-UTILS_DIR:=$(PWD)/../utils
 METADATA_DIR:=$(PWD)/../.metadata
 BINARY_PATH = /sbin
 
@@ -135,28 +134,12 @@ install_files:
 	@mkdir -p $(DESTDIR)$(BINARY_PATH)
 	@install -m 755 $(TARGET) $(DESTDIR)$(BINARY_PATH)/$(TARGET)
 	@mkdir -p $(DESTDIR)/usr/share/man/man8
-	@install -m 644 $(UTILS_DIR)/$(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8
-
-	@install -m 755 -d $(DESTDIR)/etc/opencas
-	@install -m 644 $(UTILS_DIR)/opencas.conf $(DESTDIR)/etc/opencas/opencas.conf
-	@install -m 444 $(UTILS_DIR)/ioclass-config.csv $(DESTDIR)/etc/opencas/ioclass-config.csv
-	@install -m 755 -d $(DESTDIR)/var/lib/opencas
-	@install -m 644 $(METADATA_DIR)/cas_version $(DESTDIR)/var/lib/opencas/cas_version
-
+	@install -m 644 $(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8
 	@mkdir -p $(DESTDIR)/usr/share/man/man5
-	@install -m 644 $(UTILS_DIR)/opencas.conf.5 $(DESTDIR)/usr/share/man/man5/opencas.conf.5
 
 uninstall:
 	@echo "Uninstalling casadm"
 	@rm $(DESTDIR)$(BINARY_PATH)/$(TARGET)
 	@rm $(DESTDIR)/usr/share/man/man8/$(TARGET).8
 
-	@rm $(DESTDIR)/etc/opencas/opencas.conf
-	@rm $(DESTDIR)/etc/opencas/ioclass-config.csv
-	@rm -rf $(DESTDIR)/etc/opencas
-	@rm $(DESTDIR)/var/lib/opencas/cas_version
-	@rm -rf $(DESTDIR)/var/lib/opencas
-
-	@rm $(DESTDIR)/usr/share/man/man5/opencas.conf.5
-
 .PHONY: clean distclean all sync build install uninstall
diff --git a/utils/casadm.8 b/casadm/casadm.8
similarity index 100%
rename from utils/casadm.8
rename to casadm/casadm.8
diff --git a/utils/Makefile b/utils/Makefile
index 315ac73..b03c956 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -5,6 +5,8 @@
 
 CASCTL_DIR = /lib/opencas
 UDEVRULES_DIR = /lib/udev/rules.d
+METADATA_DIR:=$(PWD)/../.metadata
+UTILS_DIR:=$(PWD)/../utils
 UDEV:=$(shell which udevadm)
 SYSTEMCTL := $(shell which systemctl)
 PYTHON3 := $(shell which python3)
@@ -30,6 +32,14 @@ else
 install_files:
 	@echo "Installing Open-CAS utils"
 
+	@install -m 755 -d $(DESTDIR)/etc/opencas
+	@install -m 644 $(UTILS_DIR)/opencas.conf $(DESTDIR)/etc/opencas/opencas.conf
+	@install -m 444 $(UTILS_DIR)/ioclass-config.csv $(DESTDIR)/etc/opencas/ioclass-config.csv
+	@install -m 755 -d $(DESTDIR)/var/lib/opencas
+	@install -m 644 $(METADATA_DIR)/cas_version $(DESTDIR)/var/lib/opencas/cas_version
+	@mkdir -p $(DESTDIR)/usr/share/man/man5
+	@install -m 644 $(UTILS_DIR)/opencas.conf.5 $(DESTDIR)/usr/share/man/man5/opencas.conf.5
+
 	@install -m 755 -d $(DESTDIR)$(CASCTL_DIR)
 	@install -m 644 opencas.py $(DESTDIR)$(CASCTL_DIR)/opencas.py
 	@install -m 755 casctl $(DESTDIR)$(CASCTL_DIR)/casctl
@@ -58,6 +68,15 @@ install_files:
 endif
 
 uninstall:
+	@echo "Uninstalling Open-CAS utils"
+
+        @rm $(DESTDIR)/etc/opencas/opencas.conf
+        @rm $(DESTDIR)/etc/opencas/ioclass-config.csv
+        @rm -rf $(DESTDIR)/etc/opencas
+        @rm $(DESTDIR)/var/lib/opencas/cas_version
+        @rm -rf $(DESTDIR)/var/lib/opencas
+	@rm $(DESTDIR)/usr/share/man/man5/opencas.conf.5
+
 	@rm $(DESTDIR)$(CASCTL_DIR)/opencas.py
 	@rm $(DESTDIR)$(CASCTL_DIR)/casctl
 	@rm $(DESTDIR)$(CASCTL_DIR)/open-cas-loader
@@ -81,5 +100,4 @@ uninstall:
 	@rm $(DESTDIR)$(SYSTEMD_DIR)/open-cas.service
 	@rm $(DESTDIR)$(SYSTEMD_DIR)/../system-shutdown/open-cas.shutdown
 
-
 .PHONY: install uninstall clean distclean