diff --git a/SabreTools.IO.Test/IOExtensionsTests.cs b/SabreTools.IO.Test/Extensions/IOExtensionsTests.cs
similarity index 89%
rename from SabreTools.IO.Test/IOExtensionsTests.cs
rename to SabreTools.IO.Test/Extensions/IOExtensionsTests.cs
index 504b8b8..4db6719 100644
--- a/SabreTools.IO.Test/IOExtensionsTests.cs
+++ b/SabreTools.IO.Test/Extensions/IOExtensionsTests.cs
@@ -1,6 +1,7 @@
+using SabreTools.IO.Extensions;
 using Xunit;
 
-namespace SabreTools.IO.Test
+namespace SabreTools.IO.Test.Extensions
 {
     public class IOExtensionsTests
     {
diff --git a/SabreTools.IO.Test/ReadOnlyBitStreamTests.cs b/SabreTools.IO.Test/Streams/ReadOnlyBitStreamTests.cs
similarity index 97%
rename from SabreTools.IO.Test/ReadOnlyBitStreamTests.cs
rename to SabreTools.IO.Test/Streams/ReadOnlyBitStreamTests.cs
index 5301c7e..e8d5277 100644
--- a/SabreTools.IO.Test/ReadOnlyBitStreamTests.cs
+++ b/SabreTools.IO.Test/Streams/ReadOnlyBitStreamTests.cs
@@ -2,7 +2,7 @@ using System.IO;
 using SabreTools.IO.Streams;
 using Xunit;
 
-namespace SabreTools.IO.Test
+namespace SabreTools.IO.Test.Streams
 {
     public class ReadOnlyBitStreamTests
     {
diff --git a/SabreTools.IO.Test/ReadOnlyCompositeStreamTests.cs b/SabreTools.IO.Test/Streams/ReadOnlyCompositeStreamTests.cs
similarity index 99%
rename from SabreTools.IO.Test/ReadOnlyCompositeStreamTests.cs
rename to SabreTools.IO.Test/Streams/ReadOnlyCompositeStreamTests.cs
index 2454f9b..8f7f534 100644
--- a/SabreTools.IO.Test/ReadOnlyCompositeStreamTests.cs
+++ b/SabreTools.IO.Test/Streams/ReadOnlyCompositeStreamTests.cs
@@ -4,7 +4,7 @@ using System.IO;
 using SabreTools.IO.Streams;
 using Xunit;
 
-namespace SabreTools.IO.Test
+namespace SabreTools.IO.Test.Streams
 {
     public class ReadOnlyCompositeStreamTests
     {
diff --git a/SabreTools.IO/Streams/ReadOnlyBitStream.cs b/SabreTools.IO/Streams/ReadOnlyBitStream.cs
index 54e084b..cfaa016 100644
--- a/SabreTools.IO/Streams/ReadOnlyBitStream.cs
+++ b/SabreTools.IO/Streams/ReadOnlyBitStream.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using SabreTools.IO.Extensions;
 
 namespace SabreTools.IO.Streams
 {