diff --git a/hactoolnet/Program.cs b/hactoolnet/Program.cs
index 65d04c49..e3e87ce5 100644
--- a/hactoolnet/Program.cs
+++ b/hactoolnet/Program.cs
@@ -183,7 +183,7 @@ namespace hactoolnet
                     return;
                 }
 
-                var section = title.MainNca.Sections.FirstOrDefault(x => x.IsExefs == true);
+                var section = title.MainNca.Sections.FirstOrDefault(x => x.IsExefs);
 
                 if (section == null)
                 {
@@ -313,7 +313,7 @@ namespace hactoolnet
                         return;
                     }
 
-                    var exefsSection = mainNca.Sections.FirstOrDefault(x => x.IsExefs == true);
+                    var exefsSection = mainNca.Sections.FirstOrDefault(x => x.IsExefs);
 
                     if (exefsSection == null)
                     {
diff --git a/libhac/Savefile/Savefile.cs b/libhac/Savefile/Savefile.cs
index c92069bb..43ecc1e1 100644
--- a/libhac/Savefile/Savefile.cs
+++ b/libhac/Savefile/Savefile.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
+using libhac.Streams;
 
 namespace libhac.Savefile
 {
diff --git a/libhac/SdFs.cs b/libhac/SdFs.cs
index 6d707dc3..6a3ce3f9 100644
--- a/libhac/SdFs.cs
+++ b/libhac/SdFs.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
+using libhac.Streams;
 
 namespace libhac
 {
diff --git a/libhac/CombinationStream.cs b/libhac/Streams/CombinationStream.cs
similarity index 99%
rename from libhac/CombinationStream.cs
rename to libhac/Streams/CombinationStream.cs
index b998c002..f33dc47a 100644
--- a/libhac/CombinationStream.cs
+++ b/libhac/Streams/CombinationStream.cs
@@ -27,7 +27,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 
-namespace libhac
+namespace libhac.Streams
 {
     internal class CombinationStream : Stream
     {
diff --git a/libhac/Substream.cs b/libhac/Streams/SubStream.cs
similarity index 98%
rename from libhac/Substream.cs
rename to libhac/Streams/SubStream.cs
index fa3bca31..39aa2055 100644
--- a/libhac/Substream.cs
+++ b/libhac/Streams/SubStream.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace libhac
+namespace libhac.Streams
 {
     public class SubStream : Stream
     {
diff --git a/libhac/Xci.cs b/libhac/Xci.cs
index 86923310..60c3e510 100644
--- a/libhac/Xci.cs
+++ b/libhac/Xci.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using libhac.Streams;
 
 namespace libhac
 {