diff --git a/IOStreams/CMakeLists.txt b/IOStreams/CMakeLists.txt
index ade9e39..21d3f4d 100644
--- a/IOStreams/CMakeLists.txt
+++ b/IOStreams/CMakeLists.txt
@@ -2,3 +2,9 @@ add_subdirectory( IStreamable.test )
 add_subdirectory( OStreamable.test )
 add_subdirectory( streamable.test )
 add_subdirectory( OutUnixFileBuf.test )
+add_subdirectory( StackableStreambuf.test )
+
+target_sources( alepha PRIVATE
+	StackableStreambuf.cc
+)
+
diff --git a/Utility/StackableStreambuf.cc b/IOStreams/StackableStreambuf.cc
similarity index 97%
rename from Utility/StackableStreambuf.cc
rename to IOStreams/StackableStreambuf.cc
index fc9fba2..c7efdab 100644
--- a/Utility/StackableStreambuf.cc
+++ b/IOStreams/StackableStreambuf.cc
@@ -4,7 +4,7 @@ static_assert( __cplusplus > 2020'99 );
 
 #include <cassert>
 
-namespace Alepha::Hydrogen::Utility::detail::stackable_streambuf
+namespace Alepha::Hydrogen::IOStreams::detail::stackable_streambuf
 {
 	namespace
 	{
diff --git a/Utility/StackableStreambuf.h b/IOStreams/StackableStreambuf.h
similarity index 88%
rename from Utility/StackableStreambuf.h
rename to IOStreams/StackableStreambuf.h
index 1d94284..5dfd60f 100644
--- a/Utility/StackableStreambuf.h
+++ b/IOStreams/StackableStreambuf.h
@@ -10,7 +10,7 @@ static_assert( __cplusplus > 2020'99 );
 #include <memory>
 #include <stack>
 
-namespace Alepha::Hydrogen::Utility  ::detail::  stackable_streambuf
+namespace Alepha::Hydrogen::IOStreams  ::detail::  stackable_streambuf
 {
 	inline namespace exports
 	{
@@ -63,7 +63,7 @@ namespace Alepha::Hydrogen::Utility  ::detail::  stackable_streambuf
 	}
 }
 
-namespace Alepha::Hydrogen::Utility::inline exports::inline stackable_streambuf
+namespace Alepha::Hydrogen::IOStreams::inline exports::inline stackable_streambuf
 {
 	using namespace detail::stackable_streambuf::exports;
 }
diff --git a/Utility/StackableStreambuf.test/0.cc b/IOStreams/StackableStreambuf.test/0.cc
similarity index 100%
rename from Utility/StackableStreambuf.test/0.cc
rename to IOStreams/StackableStreambuf.test/0.cc
diff --git a/Utility/StackableStreambuf.test/CMakeLists.txt b/IOStreams/StackableStreambuf.test/CMakeLists.txt
similarity index 100%
rename from Utility/StackableStreambuf.test/CMakeLists.txt
rename to IOStreams/StackableStreambuf.test/CMakeLists.txt
diff --git a/Utility/CMakeLists.txt b/Utility/CMakeLists.txt
index af16b8e..e69de29 100644
--- a/Utility/CMakeLists.txt
+++ b/Utility/CMakeLists.txt
@@ -1,5 +0,0 @@
-target_sources( alepha PRIVATE
-	StackableStreambuf.cc
-)
-
-add_subdirectory( StackableStreambuf.test )
diff --git a/string_algorithms.cc b/string_algorithms.cc
index 164ef9d..8a49451 100644
--- a/string_algorithms.cc
+++ b/string_algorithms.cc
@@ -22,7 +22,7 @@ namespace Alepha::Hydrogen  ::detail::  string_algorithms
 		}
 
 		struct VariableExpansionStreambuf
-			: public Utility::StackableStreambuf
+			: public IOStreams::StackableStreambuf
 		{
 			public:
 				VarMap substitutions;
diff --git a/string_algorithms.h b/string_algorithms.h
index d281893..978d529 100644
--- a/string_algorithms.h
+++ b/string_algorithms.h
@@ -18,7 +18,7 @@ static_assert( __cplusplus > 2020'99 );
 
 #include <Alepha/Concepts.h>
 
-#include <Alepha/Utility/StackableStreambuf.h>
+#include <Alepha/IOStreams/StackableStreambuf.h>
 
 namespace Alepha::Hydrogen  ::detail::  string_algorithms
 {
@@ -51,11 +51,11 @@ namespace Alepha::Hydrogen  ::detail::  string_algorithms
 			{}
 		};
 
-		using StartSubstitutions= Utility::PushStack< StartSubstitutions_params >;
+		using StartSubstitutions= IOStreams::PushStack< StartSubstitutions_params >;
 
 		// Note that these function as a stack -- so `EndSubstitutions` will
 		// terminate the top of that stack.
-		constexpr Utility::PopStack EndSubstitutions;
+		constexpr IOStreams::PopStack EndSubstitutions;
 
 		inline namespace impl
 		{
diff --git a/word_wrap.cc b/word_wrap.cc
index 9a63f76..4f6bf5c 100644
--- a/word_wrap.cc
+++ b/word_wrap.cc
@@ -41,7 +41,7 @@ namespace Alepha::Hydrogen  ::detail::  word_wrap_m
 		}
 
 		struct WordWrapStreambuf
-			: public Utility::StackableStreambuf
+			: public IOStreams::StackableStreambuf
 		{
 			public:
 				std::size_t maximumWidth= 0;
diff --git a/word_wrap.h b/word_wrap.h
index d4a4606..d8c7b8d 100644
--- a/word_wrap.h
+++ b/word_wrap.h
@@ -9,7 +9,7 @@ static_assert( __cplusplus > 2020'99 );
 #include <string>
 #include <streambuf>
 
-#include <Alepha/Utility/StackableStreambuf.h>
+#include <Alepha/IOStreams/StackableStreambuf.h>
 
 namespace Alepha::Hydrogen  ::detail::  word_wrap_m
 {
@@ -25,9 +25,9 @@ namespace Alepha::Hydrogen  ::detail::  word_wrap_m
 			explicit StartWrap_params( const std::size_t width, const std::size_t nextLineOffset= 0 ) : width( width ), nextLineOffset( nextLineOffset ) {}
 		};
 
-		using StartWrap= Utility::PushStack< StartWrap_params >;
+		using StartWrap= IOStreams::PushStack< StartWrap_params >;
 
-		constexpr Utility::PopStack EndWrap;
+		constexpr IOStreams::PopStack EndWrap;
 	}
 
 	inline namespace impl