diff --git a/RombaSharp/Partials/RombaSharp_Helpers.cs b/RombaSharp/Partials/RombaSharp_Helpers.cs
index 819b7334..03e4ac11 100644
--- a/RombaSharp/Partials/RombaSharp_Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp_Helpers.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.IO;
using System.Linq;
using System.Xml;
using Mono.Data.Sqlite;
@@ -10,6 +9,13 @@ using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
+
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using SearchOption = System.IO.SearchOption;
+using StreamWriter = System.IO.StreamWriter;
+
namespace SabreTools
{
public partial class RombaSharp
diff --git a/RombaSharp/Partials/RombaSharp_Inits.cs b/RombaSharp/Partials/RombaSharp_Inits.cs
index aba3c3f0..1ba6da2a 100644
--- a/RombaSharp/Partials/RombaSharp_Inits.cs
+++ b/RombaSharp/Partials/RombaSharp_Inits.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using Mono.Data.Sqlite;
@@ -9,6 +8,8 @@ using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
+
namespace SabreTools
{
public partial class RombaSharp
diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj
index be5c57c9..92f4bc61 100644
--- a/RombaSharp/RombaSharp.csproj
+++ b/RombaSharp/RombaSharp.csproj
@@ -53,6 +53,10 @@
true
+
+ ..\packages\AlphaFS.2.1.0\lib\net451\AlphaFS.dll
+ True
+
..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\Mono.Data.Sqlite.dll
True
diff --git a/RombaSharp/packages.config b/RombaSharp/packages.config
index 2e7f170d..6c2763b9 100644
--- a/RombaSharp/packages.config
+++ b/RombaSharp/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
index 72e4fae2..90334cb4 100644
--- a/SabreTools.Helper/Dats/DatFile.cs
+++ b/SabreTools.Helper/Dats/DatFile.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
@@ -12,9 +11,20 @@ using SabreTools.Helper.Data;
using SabreTools.Helper.Skippers;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
using NaturalSort;
using SharpCompress.Common;
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using FileStream = System.IO.FileStream;
+using IOException = System.IO.IOException;
+using MemoryStream = System.IO.MemoryStream;
+using PathTooLongException = System.IO.PathTooLongException;
+using SearchOption = System.IO.SearchOption;
+using StreamReader = System.IO.StreamReader;
+using StreamWriter = System.IO.StreamWriter;
+
namespace SabreTools.Helper.Dats
{
public class DatFile : ICloneable
diff --git a/SabreTools.Helper/Dats/DatItem.cs b/SabreTools.Helper/Dats/DatItem.cs
index 6c32e63a..213dcc67 100644
--- a/SabreTools.Helper/Dats/DatItem.cs
+++ b/SabreTools.Helper/Dats/DatItem.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
-using System.IO;
using SabreTools.Helper.Data;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
using NaturalSort;
namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
index 3f17693f..99c18fe8 100644
--- a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
+++ b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
@@ -1,12 +1,21 @@
using System;
-using System.IO;
using System.Collections.Generic;
using System.Text;
using SabreTools.Helper.Data;
+using Alphaleonis.Win32.Filesystem;
using OCRC;
+using BinaryReader = System.IO.BinaryReader;
+using BinaryWriter = System.IO.BinaryWriter;
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using IOException = System.IO.IOException;
+using MemoryStream = System.IO.MemoryStream;
+using PathTooLongException = System.IO.PathTooLongException;
+using Stream = System.IO.Stream;
+
namespace ROMVault2.SupportedFiles.Zip
{
///
diff --git a/SabreTools.Helper/External/Zlib/GZipStream.cs b/SabreTools.Helper/External/Zlib/GZipStream.cs
index 15f548e6..b6b16817 100644
--- a/SabreTools.Helper/External/Zlib/GZipStream.cs
+++ b/SabreTools.Helper/External/Zlib/GZipStream.cs
@@ -27,7 +27,12 @@
// ------------------------------------------------------------------
using System;
-using System.IO;
+
+using Alphaleonis.Win32.Filesystem;
+
+using MemoryStream = System.IO.MemoryStream;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
namespace Ionic.Zlib
{
diff --git a/SabreTools.Helper/Logger.cs b/SabreTools.Helper/Logger.cs
index e96c0d1f..af89a63c 100644
--- a/SabreTools.Helper/Logger.cs
+++ b/SabreTools.Helper/Logger.cs
@@ -1,5 +1,9 @@
using System;
-using System.IO;
+
+using Alphaleonis.Win32.Filesystem;
+
+using FileMode = System.IO.FileMode;
+using StreamWriter = System.IO.StreamWriter;
namespace SabreTools.Helper
{
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index 8d23bb4d..c4afc049 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -53,6 +53,10 @@
OnBuildSuccess
+
+ ..\packages\AlphaFS.2.1.0\lib\net451\AlphaFS.dll
+ True
+
..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\Mono.Data.Sqlite.dll
True
diff --git a/SabreTools.Helper/Skippers/Skipper.cs b/SabreTools.Helper/Skippers/Skipper.cs
index 3a54b512..fa0d4b11 100644
--- a/SabreTools.Helper/Skippers/Skipper.cs
+++ b/SabreTools.Helper/Skippers/Skipper.cs
@@ -1,12 +1,18 @@
using System;
using System.Collections.Generic;
using System.Globalization;
-using System.IO;
using System.Xml;
using SabreTools.Helper.Data;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
+
+using BinaryReader = System.IO.BinaryReader;
+using SearchOption = System.IO.SearchOption;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+
namespace SabreTools.Helper.Skippers
{
public class Skipper
diff --git a/SabreTools.Helper/Skippers/SkipperRule.cs b/SabreTools.Helper/Skippers/SkipperRule.cs
index 6b7b0ae8..47ec7011 100644
--- a/SabreTools.Helper/Skippers/SkipperRule.cs
+++ b/SabreTools.Helper/Skippers/SkipperRule.cs
@@ -1,9 +1,19 @@
using System;
using System.Collections.Generic;
-using System.IO;
using SabreTools.Helper.Data;
+using Alphaleonis.Win32.Filesystem;
+
+using BinaryReader = System.IO.BinaryReader;
+using BinaryWriter = System.IO.BinaryWriter;
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using FileShare = System.IO.FileShare;
+using FileStream = System.IO.FileStream;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+
namespace SabreTools.Helper.Skippers
{
public class SkipperRule
diff --git a/SabreTools.Helper/Tools/ArchiveTools.cs b/SabreTools.Helper/Tools/ArchiveTools.cs
index 956d9530..cfd4dac2 100644
--- a/SabreTools.Helper/Tools/ArchiveTools.cs
+++ b/SabreTools.Helper/Tools/ArchiveTools.cs
@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
+using Alphaleonis.Win32.Filesystem;
using Ionic.Zlib;
using ROMVault2.SupportedFiles.Zip;
using SharpCompress.Archives;
@@ -16,6 +16,17 @@ using SharpCompress.Common;
using SharpCompress.Readers;
using SharpCompress.Writers;
+using BinaryReader = System.IO.BinaryReader;
+using BinaryWriter = System.IO.BinaryWriter;
+using EndOfStreamException = System.IO.EndOfStreamException;
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using FileShare = System.IO.FileShare;
+using FileStream = System.IO.FileStream;
+using MemoryStream = System.IO.MemoryStream;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+
namespace SabreTools.Helper.Tools
{
public static class ArchiveTools
diff --git a/SabreTools.Helper/Tools/DatabaseTools.cs b/SabreTools.Helper/Tools/DatabaseTools.cs
index 115d260c..c30ee54d 100644
--- a/SabreTools.Helper/Tools/DatabaseTools.cs
+++ b/SabreTools.Helper/Tools/DatabaseTools.cs
@@ -1,9 +1,10 @@
using Mono.Data.Sqlite;
using System;
-using System.IO;
using SabreTools.Helper.Data;
+using Alphaleonis.Win32.Filesystem;
+
namespace SabreTools.Helper.Tools
{
///
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index 8fc1de38..57054791 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -1,7 +1,6 @@
using Mono.Data.Sqlite;
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Xml;
@@ -11,9 +10,20 @@ using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
using SabreTools.Helper.Skippers;
+using Alphaleonis.Win32.Filesystem;
using NaturalSort;
using OCRC;
+using BinaryReader = System.IO.BinaryReader;
+using BinaryWriter = System.IO.BinaryWriter;
+using FileStream = System.IO.FileStream;
+using IOException = System.IO.IOException;
+using MemoryStream = System.IO.MemoryStream;
+using SearchOption = System.IO.SearchOption;
+using SeekOrigin = System.IO.SeekOrigin;
+using Stream = System.IO.Stream;
+using StreamReader = System.IO.StreamReader;
+
namespace SabreTools.Helper.Tools
{
public static class FileTools
diff --git a/SabreTools.Helper/Tools/Style.cs b/SabreTools.Helper/Tools/Style.cs
index be1e4a77..f393885e 100644
--- a/SabreTools.Helper/Tools/Style.cs
+++ b/SabreTools.Helper/Tools/Style.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
@@ -10,6 +9,12 @@ using System.Web;
using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
+using Alphaleonis.Win32.Filesystem;
+
+using FileAccess = System.IO.FileAccess;
+using FileMode = System.IO.FileMode;
+using FileStream = System.IO.FileStream;
+
namespace SabreTools.Helper.Tools
{
///
diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
index cb34d93e..8b182f0c 100644
--- a/SabreTools/Partials/SabreTools_Inits.cs
+++ b/SabreTools/Partials/SabreTools_Inits.cs
@@ -1,12 +1,15 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using SabreTools.Helper.Data;
using SabreTools.Helper.Dats;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
+
+using SearchOption = System.IO.SearchOption;
+
namespace SabreTools
{
public partial class SabreTools
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 804f1b40..c5b1787e 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
-using System.IO;
using SabreTools.Helper;
using SabreTools.Helper.Data;
using SabreTools.Helper.Tools;
+using Alphaleonis.Win32.Filesystem;
+
namespace SabreTools
{
///
diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj
index 38f1e8a3..cf46d76c 100644
--- a/SabreTools/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -70,6 +70,10 @@
true
+
+ ..\packages\AlphaFS.2.1.0\lib\net451\AlphaFS.dll
+ True
+
..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\Mono.Data.Sqlite.dll
True
diff --git a/SabreTools/packages.config b/SabreTools/packages.config
index fb1e0cbe..579ff095 100644
--- a/SabreTools/packages.config
+++ b/SabreTools/packages.config
@@ -1,5 +1,6 @@
+
\ No newline at end of file