diff --git a/include/ureact/adaptor/detail/adjacent_base.hpp b/include/ureact/adaptor/detail/adjacent_base.hpp
index b0ce451..d15b945 100644
--- a/include/ureact/adaptor/detail/adjacent_base.hpp
+++ b/include/ureact/adaptor/detail/adjacent_base.hpp
@@ -16,8 +16,8 @@
 
 #include <ureact/detail/defines.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/detail/reactive_op_base.hpp b/include/ureact/adaptor/detail/reactive_op_base.hpp
index f459d62..265a1ba 100644
--- a/include/ureact/adaptor/detail/reactive_op_base.hpp
+++ b/include/ureact/adaptor/detail/reactive_op_base.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_DETAIL_REACTIVE_OP_BASE_HPP
 
 #include <ureact/detail/linker_functor.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/detail/synced_adaptor_base.hpp b/include/ureact/adaptor/detail/synced_adaptor_base.hpp
index 2eeacdd..cd9d4b3 100644
--- a/include/ureact/adaptor/detail/synced_adaptor_base.hpp
+++ b/include/ureact/adaptor/detail/synced_adaptor_base.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_DETAIL_SYNCED_ADAPTOR_BASE_HPP
 
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/utility/signal_pack.hpp>
+#include <ureact/signal_pack.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/detail/zip_base.hpp b/include/ureact/adaptor/detail/zip_base.hpp
index 9f4d61c..c4930b8 100644
--- a/include/ureact/adaptor/detail/zip_base.hpp
+++ b/include/ureact/adaptor/detail/zip_base.hpp
@@ -16,7 +16,7 @@
 
 #include <ureact/detail/defines.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/flatten.hpp b/include/ureact/adaptor/flatten.hpp
index c93ac39..9c30339 100644
--- a/include/ureact/adaptor/flatten.hpp
+++ b/include/ureact/adaptor/flatten.hpp
@@ -15,7 +15,7 @@
 #include <ureact/context.hpp>
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/fold.hpp b/include/ureact/adaptor/fold.hpp
index 5aa7b66..c45b1a3 100644
--- a/include/ureact/adaptor/fold.hpp
+++ b/include/ureact/adaptor/fold.hpp
@@ -14,10 +14,10 @@
 
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/signal.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/lift.hpp b/include/ureact/adaptor/lift.hpp
index 88d2c0c..26915ca 100644
--- a/include/ureact/adaptor/lift.hpp
+++ b/include/ureact/adaptor/lift.hpp
@@ -18,8 +18,8 @@
 #include <ureact/detail/deduce_result_type.hpp>
 #include <ureact/detail/temp_signal.hpp>
 #include <ureact/signal.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/observe.hpp b/include/ureact/adaptor/observe.hpp
index 83144a7..77623f5 100644
--- a/include/ureact/adaptor/observe.hpp
+++ b/include/ureact/adaptor/observe.hpp
@@ -15,11 +15,11 @@
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
 #include <ureact/detail/observer_node.hpp>
+#include <ureact/observe_policy.hpp>
 #include <ureact/observer.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/observer_action.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/observer_action.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/process.hpp b/include/ureact/adaptor/process.hpp
index 782981f..e205bf5 100644
--- a/include/ureact/adaptor/process.hpp
+++ b/include/ureact/adaptor/process.hpp
@@ -14,10 +14,10 @@
 
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
+#include <ureact/event_emitter.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/event_emitter.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/signal_pack.hpp>
+#include <ureact/signal_pack.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/reactive_ref.hpp b/include/ureact/adaptor/reactive_ref.hpp
index 309d612..a696e2d 100644
--- a/include/ureact/adaptor/reactive_ref.hpp
+++ b/include/ureact/adaptor/reactive_ref.hpp
@@ -13,7 +13,7 @@
 #include <ureact/adaptor/flatten.hpp>
 #include <ureact/adaptor/lift.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/slice.hpp b/include/ureact/adaptor/slice.hpp
index f48980c..2587443 100644
--- a/include/ureact/adaptor/slice.hpp
+++ b/include/ureact/adaptor/slice.hpp
@@ -15,7 +15,7 @@
 
 #include <ureact/adaptor/detail/take_drop_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/tap.hpp b/include/ureact/adaptor/tap.hpp
index d3115cc..9b16b34 100644
--- a/include/ureact/adaptor/tap.hpp
+++ b/include/ureact/adaptor/tap.hpp
@@ -11,8 +11,8 @@
 #define UREACT_ADAPTOR_TAP_HPP
 
 #include <ureact/adaptor/observe.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/observe_policy.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/adaptor/unify.hpp b/include/ureact/adaptor/unify.hpp
index 3630a24..e9d7645 100644
--- a/include/ureact/adaptor/unify.hpp
+++ b/include/ureact/adaptor/unify.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_UNIFY_HPP
 
 #include <ureact/adaptor/cast.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/detail/adaptor.hpp b/include/ureact/detail/adaptor.hpp
index bb57512..96eb292 100644
--- a/include/ureact/detail/adaptor.hpp
+++ b/include/ureact/detail/adaptor.hpp
@@ -14,7 +14,7 @@
 #include <utility>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/utility/event_emitter.hpp b/include/ureact/event_emitter.hpp
similarity index 93%
rename from include/ureact/utility/event_emitter.hpp
rename to include/ureact/event_emitter.hpp
index 4059f4c..cb17b10 100644
--- a/include/ureact/utility/event_emitter.hpp
+++ b/include/ureact/event_emitter.hpp
@@ -7,13 +7,13 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_EVENT_EMITTER_HPP
-#define UREACT_UTILITY_EVENT_EMITTER_HPP
+#ifndef UREACT_EVENT_EMITTER_HPP
+#define UREACT_EVENT_EMITTER_HPP
 
 #include <vector>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
@@ -93,4 +93,4 @@ class event_emitter final
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_EVENT_EMITTER_HPP
+#endif //UREACT_EVENT_EMITTER_HPP
diff --git a/include/ureact/utility/event_range.hpp b/include/ureact/event_range.hpp
similarity index 93%
rename from include/ureact/utility/event_range.hpp
rename to include/ureact/event_range.hpp
index 57447f3..bb216ec 100644
--- a/include/ureact/utility/event_range.hpp
+++ b/include/ureact/event_range.hpp
@@ -7,13 +7,13 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_EVENT_RANGE_HPP
-#define UREACT_UTILITY_EVENT_RANGE_HPP
+#ifndef UREACT_EVENT_RANGE_HPP
+#define UREACT_EVENT_RANGE_HPP
 
 #include <vector>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
@@ -94,4 +94,4 @@ class event_range final
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_EVENT_RANGE_HPP
+#endif //UREACT_EVENT_RANGE_HPP
diff --git a/include/ureact/events.hpp b/include/ureact/events.hpp
index 9ffedcc..8212c24 100644
--- a/include/ureact/events.hpp
+++ b/include/ureact/events.hpp
@@ -15,8 +15,8 @@
 
 #include <ureact/context.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/event_range.hpp> // event ranges often needed along with events.hpp header
-#include <ureact/utility/unit.hpp>
+#include <ureact/event_range.hpp> // event ranges often needed along with events.hpp header
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/utility/observe_policy.hpp b/include/ureact/observe_policy.hpp
similarity index 84%
rename from include/ureact/utility/observe_policy.hpp
rename to include/ureact/observe_policy.hpp
index 73b23dd..b3bfd9a 100644
--- a/include/ureact/utility/observe_policy.hpp
+++ b/include/ureact/observe_policy.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_OBSERVE_POLICY_HPP
-#define UREACT_UTILITY_OBSERVE_POLICY_HPP
+#ifndef UREACT_OBSERVE_POLICY_HPP
+#define UREACT_OBSERVE_POLICY_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -25,4 +25,4 @@ enum class observe_policy
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_OBSERVE_POLICY_HPP
+#endif //UREACT_OBSERVE_POLICY_HPP
diff --git a/include/ureact/utility/observer_action.hpp b/include/ureact/observer_action.hpp
similarity index 81%
rename from include/ureact/utility/observer_action.hpp
rename to include/ureact/observer_action.hpp
index 74f7746..4ad5ddb 100644
--- a/include/ureact/utility/observer_action.hpp
+++ b/include/ureact/observer_action.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_OBSERVER_ACTION_HPP
-#define UREACT_UTILITY_OBSERVER_ACTION_HPP
+#ifndef UREACT_OBSERVER_ACTION_HPP
+#define UREACT_OBSERVER_ACTION_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -25,4 +25,4 @@ enum class observer_action
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_OBSERVER_ACTION_HPP
+#endif //UREACT_OBSERVER_ACTION_HPP
diff --git a/include/ureact/signal.hpp b/include/ureact/signal.hpp
index 771306d..2216576 100644
--- a/include/ureact/signal.hpp
+++ b/include/ureact/signal.hpp
@@ -15,7 +15,7 @@
 #include <ureact/context.hpp>
 #include <ureact/detail/has_changed.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
diff --git a/include/ureact/utility/signal_pack.hpp b/include/ureact/signal_pack.hpp
similarity index 91%
rename from include/ureact/utility/signal_pack.hpp
rename to include/ureact/signal_pack.hpp
index a673791..76da989 100644
--- a/include/ureact/utility/signal_pack.hpp
+++ b/include/ureact/signal_pack.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_SIGNAL_PACK_HPP
-#define UREACT_UTILITY_SIGNAL_PACK_HPP
+#ifndef UREACT_SIGNAL_PACK_HPP
+#define UREACT_SIGNAL_PACK_HPP
 
 #include <tuple>
 
@@ -59,4 +59,4 @@ UREACT_WARN_UNUSED_RESULT auto with( const signal<Values>&... deps )
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_SIGNAL_PACK_HPP
+#endif //UREACT_SIGNAL_PACK_HPP
diff --git a/include/ureact/utility/type_traits.hpp b/include/ureact/type_traits.hpp
similarity index 98%
rename from include/ureact/utility/type_traits.hpp
rename to include/ureact/type_traits.hpp
index d44bf3d..60757c6 100644
--- a/include/ureact/utility/type_traits.hpp
+++ b/include/ureact/type_traits.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_TYPE_TRAITS_HPP
-#define UREACT_UTILITY_TYPE_TRAITS_HPP
+#ifndef UREACT_TYPE_TRAITS_HPP
+#define UREACT_TYPE_TRAITS_HPP
 
 #include <type_traits>
 
@@ -334,4 +334,4 @@ inline constexpr bool is_reactive_v = is_reactive<T>::value;
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_TYPE_TRAITS_HPP
+#endif //UREACT_TYPE_TRAITS_HPP
diff --git a/include/ureact/utility/unit.hpp b/include/ureact/unit.hpp
similarity index 94%
rename from include/ureact/utility/unit.hpp
rename to include/ureact/unit.hpp
index 349f1ba..0303edc 100644
--- a/include/ureact/utility/unit.hpp
+++ b/include/ureact/unit.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_UNIT_HPP
-#define UREACT_UTILITY_UNIT_HPP
+#ifndef UREACT_UNIT_HPP
+#define UREACT_UNIT_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -44,4 +44,4 @@ constexpr bool operator>=(unit, unit) noexcept { return true; }
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_UNIT_HPP
+#endif //UREACT_UNIT_HPP
diff --git a/include/ureact/ureact.hpp b/include/ureact/ureact.hpp
index 158fba5..4383073 100644
--- a/include/ureact/ureact.hpp
+++ b/include/ureact/ureact.hpp
@@ -15,16 +15,16 @@
 // clang-format on
 
 #include <ureact/context.hpp>
+#include <ureact/event_emitter.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/events.hpp>
+#include <ureact/observe_policy.hpp>
 #include <ureact/observer.hpp>
+#include <ureact/observer_action.hpp>
 #include <ureact/signal.hpp>
+#include <ureact/signal_pack.hpp>
 #include <ureact/transaction.hpp>
-#include <ureact/utility/event_emitter.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/observer_action.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/type_traits.hpp>
+#include <ureact/unit.hpp>
 
 #endif //UREACT_UREACT_HPP