diff --git a/src/util/hei_bit_string.hpp b/src/hei_bit_string.hpp
similarity index 100%
rename from src/util/hei_bit_string.hpp
rename to src/hei_bit_string.hpp
diff --git a/src/isolator/hei_isolation_node.cpp b/src/isolator/hei_isolation_node.cpp
index 98f9ca4..15bf5cf 100644
--- a/src/isolator/hei_isolation_node.cpp
+++ b/src/isolator/hei_isolation_node.cpp
@@ -1,5 +1,5 @@
+#include <hei_bit_string.hpp>
 #include <isolator/hei_isolation_node.hpp>
-#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_hardware_register.cpp b/src/register/hei_hardware_register.cpp
index d24d251..2aa1544 100644
--- a/src/register/hei_hardware_register.cpp
+++ b/src/register/hei_hardware_register.cpp
@@ -1,7 +1,7 @@
+#include <hei_bit_string.hpp>
 #include <hei_includes.hpp>
 #include <hei_user_interface.hpp>
 #include <register/hei_hardware_register.hpp>
-#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_hardware_register.hpp b/src/register/hei_hardware_register.hpp
index 358cc8f..fedece0 100644
--- a/src/register/hei_hardware_register.hpp
+++ b/src/register/hei_hardware_register.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <hei_bit_string.hpp>
 #include <hei_includes.hpp>
 #include <register/hei_register.hpp>
-#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_register.hpp b/src/register/hei_register.hpp
index e0473aa..ff630f3 100644
--- a/src/register/hei_register.hpp
+++ b/src/register/hei_register.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <hei_bit_string.hpp>
 #include <hei_includes.hpp>
-#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {
diff --git a/src/util/hei_bit_string.cpp b/src/util/hei_bit_string.cpp
index a04fb43..9129663 100644
--- a/src/util/hei_bit_string.cpp
+++ b/src/util/hei_bit_string.cpp
@@ -2,8 +2,8 @@
  *  @brief BitString and BitStringBuffer class definitions
  */
 
+#include <hei_bit_string.hpp>
 #include <hei_includes.hpp>
-#include <util/hei_bit_string.hpp>
 
 #include <algorithm>