diff --git a/hsfs/utils/java/pom.xml b/utils/java/pom.xml
similarity index 100%
rename from hsfs/utils/java/pom.xml
rename to utils/java/pom.xml
diff --git a/hsfs/utils/java/src/main/java/com/logicalclocks/utils/MainClass.java b/utils/java/src/main/java/com/logicalclocks/utils/MainClass.java
similarity index 100%
rename from hsfs/utils/java/src/main/java/com/logicalclocks/utils/MainClass.java
rename to utils/java/src/main/java/com/logicalclocks/utils/MainClass.java
diff --git a/hsfs/utils/java/src/main/resources/checkstyle.xml b/utils/java/src/main/resources/checkstyle.xml
similarity index 100%
rename from hsfs/utils/java/src/main/resources/checkstyle.xml
rename to utils/java/src/main/resources/checkstyle.xml
diff --git a/hsfs/utils/java/src/main/resources/suppressions.xml b/utils/java/src/main/resources/suppressions.xml
similarity index 100%
rename from hsfs/utils/java/src/main/resources/suppressions.xml
rename to utils/java/src/main/resources/suppressions.xml
diff --git a/hsfs/utils/python/hsfs_utils.py b/utils/python/hsfs_utils.py
similarity index 100%
rename from hsfs/utils/python/hsfs_utils.py
rename to utils/python/hsfs_utils.py