diff --git a/Makefile b/Makefile
index a32d669..afd91d8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,16 +27,16 @@ endif
 endif
 
 archives:
-	@utils/pckgen $(PWD) tar zip
+	@tools/pckgen $(PWD) tar zip
 
 rpm:
-	@utils/pckgen $(PWD) rpm --debug
+	@tools/pckgen $(PWD) rpm --debug
 
 srpm:
-	@utils/pckgen $(PWD) srpm --debug
+	@tools/pckgen $(PWD) srpm --debug
 
 deb:
-	@utils/pckgen $(PWD) deb
+	@tools/pckgen $(PWD) deb
 
 dsc:
-	@utils/pckgen $(PWD) dsc
+	@tools/pckgen $(PWD) dsc
diff --git a/configure b/configure
index 375c588..0643a82 100755
--- a/configure
+++ b/configure
@@ -79,7 +79,7 @@ fi
 
 # Run version generator with 'build' flag to
 # indicate that we are in the build process
-(cd utils && ./cas_version_gen build)
+(cd tools && ./cas_version_gen build)
 if [ $? -ne 0 ]; then
 	echo "Error: failed to obtain CAS version" >&2
 	exit 1
diff --git a/utils/cas_version_gen b/tools/cas_version_gen
similarity index 100%
rename from utils/cas_version_gen
rename to tools/cas_version_gen
diff --git a/utils/pckgen b/tools/pckgen
similarity index 99%
rename from utils/pckgen
rename to tools/pckgen
index 3ded45d..7d67c2b 100755
--- a/utils/pckgen
+++ b/tools/pckgen
@@ -515,7 +515,7 @@ DEB_BUILD_DIR="$TEMP_DIR/debuild"
 # Version file location:
 VERSION_FILE="$SOURCES_DIR/.metadata/cas_version"
 # CAS version generator location:
-CAS_VERSION_GEN="$SOURCES_DIR/utils/cas_version_gen"
+CAS_VERSION_GEN="$SOURCES_DIR/tools/cas_version_gen"
 
 check_version
 
diff --git a/utils/pckgen.d/deb/debian/CAS_NAME-modules.dkms b/tools/pckgen.d/deb/debian/CAS_NAME-modules.dkms
similarity index 100%
rename from utils/pckgen.d/deb/debian/CAS_NAME-modules.dkms
rename to tools/pckgen.d/deb/debian/CAS_NAME-modules.dkms
diff --git a/utils/pckgen.d/deb/debian/CAS_NAME-modules.install b/tools/pckgen.d/deb/debian/CAS_NAME-modules.install
similarity index 100%
rename from utils/pckgen.d/deb/debian/CAS_NAME-modules.install
rename to tools/pckgen.d/deb/debian/CAS_NAME-modules.install
diff --git a/utils/pckgen.d/deb/debian/CAS_NAME.docs b/tools/pckgen.d/deb/debian/CAS_NAME.docs
similarity index 100%
rename from utils/pckgen.d/deb/debian/CAS_NAME.docs
rename to tools/pckgen.d/deb/debian/CAS_NAME.docs
diff --git a/utils/pckgen.d/deb/debian/CAS_NAME.install b/tools/pckgen.d/deb/debian/CAS_NAME.install
similarity index 100%
rename from utils/pckgen.d/deb/debian/CAS_NAME.install
rename to tools/pckgen.d/deb/debian/CAS_NAME.install
diff --git a/utils/pckgen.d/deb/debian/CAS_NAME.manpages b/tools/pckgen.d/deb/debian/CAS_NAME.manpages
similarity index 100%
rename from utils/pckgen.d/deb/debian/CAS_NAME.manpages
rename to tools/pckgen.d/deb/debian/CAS_NAME.manpages
diff --git a/utils/pckgen.d/deb/debian/changelog b/tools/pckgen.d/deb/debian/changelog
similarity index 100%
rename from utils/pckgen.d/deb/debian/changelog
rename to tools/pckgen.d/deb/debian/changelog
diff --git a/utils/pckgen.d/deb/debian/compat b/tools/pckgen.d/deb/debian/compat
similarity index 100%
rename from utils/pckgen.d/deb/debian/compat
rename to tools/pckgen.d/deb/debian/compat
diff --git a/utils/pckgen.d/deb/debian/control b/tools/pckgen.d/deb/debian/control
similarity index 100%
rename from utils/pckgen.d/deb/debian/control
rename to tools/pckgen.d/deb/debian/control
diff --git a/utils/pckgen.d/deb/debian/copyright b/tools/pckgen.d/deb/debian/copyright
similarity index 100%
rename from utils/pckgen.d/deb/debian/copyright
rename to tools/pckgen.d/deb/debian/copyright
diff --git a/utils/pckgen.d/deb/debian/rules b/tools/pckgen.d/deb/debian/rules
similarity index 100%
rename from utils/pckgen.d/deb/debian/rules
rename to tools/pckgen.d/deb/debian/rules
diff --git a/utils/pckgen.d/deb/debian/source/format b/tools/pckgen.d/deb/debian/source/format
similarity index 100%
rename from utils/pckgen.d/deb/debian/source/format
rename to tools/pckgen.d/deb/debian/source/format
diff --git a/utils/pckgen.d/rpm/CAS_NAME.spec b/tools/pckgen.d/rpm/CAS_NAME.spec
similarity index 100%
rename from utils/pckgen.d/rpm/CAS_NAME.spec
rename to tools/pckgen.d/rpm/CAS_NAME.spec
diff --git a/utils/Makefile b/utils/Makefile
index b03c956..43284dc 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -70,11 +70,11 @@ 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)/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