diff --git a/src/LibHac/FsSrv/Impl/IResultConvertFileSystem.cs b/src/LibHac/FsSrv/Impl/IResultConvertFileSystem.cs
new file mode 100644
index 00000000..f5f516ef
--- /dev/null
+++ b/src/LibHac/FsSrv/Impl/IResultConvertFileSystem.cs
@@ -0,0 +1,211 @@
+using System;
+using LibHac.Common;
+using LibHac.Fs;
+using LibHac.Fs.Fsa;
+
+namespace LibHac.FsSrv.Impl
+{
+    // ReSharper disable once InconsistentNaming
+    public abstract class IResultConvertFile : IFile
+    {
+        protected IFile BaseFile;
+
+        protected IResultConvertFile(IFile baseFile)
+        {
+            BaseFile = baseFile;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                BaseFile?.Dispose();
+                BaseFile = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        protected override Result DoRead(out long bytesRead, long offset, Span<byte> destination, in ReadOption option)
+        {
+            return ConvertResult(BaseFile.Read(out bytesRead, offset, destination, option));
+        }
+
+        protected override Result DoWrite(long offset, ReadOnlySpan<byte> source, in WriteOption option)
+        {
+            return ConvertResult(BaseFile.Write(offset, source, option));
+        }
+
+        protected override Result DoFlush()
+        {
+            return ConvertResult(BaseFile.Flush());
+        }
+
+        protected override Result DoSetSize(long size)
+        {
+            return ConvertResult(BaseFile.SetSize(size));
+        }
+
+        protected override Result DoGetSize(out long size)
+        {
+            return ConvertResult(BaseFile.GetSize(out size));
+        }
+
+        protected override Result DoOperateRange(Span<byte> outBuffer, OperationId operationId, long offset, long size,
+            ReadOnlySpan<byte> inBuffer)
+        {
+            return ConvertResult(BaseFile.OperateRange(outBuffer, operationId, offset, size, inBuffer));
+        }
+
+        protected abstract Result ConvertResult(Result result);
+    }
+
+    // ReSharper disable once InconsistentNaming
+    public abstract class IResultConvertDirectory : IDirectory
+    {
+        protected IDirectory BaseDirectory;
+
+        protected IResultConvertDirectory(IDirectory baseDirectory)
+        {
+            BaseDirectory = baseDirectory;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                BaseDirectory?.Dispose();
+                BaseDirectory = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        protected override Result DoRead(out long entriesRead, Span<DirectoryEntry> entryBuffer)
+        {
+            return ConvertResult(BaseDirectory.Read(out entriesRead, entryBuffer));
+        }
+
+        protected override Result DoGetEntryCount(out long entryCount)
+        {
+            return ConvertResult(BaseDirectory.GetEntryCount(out entryCount));
+        }
+
+        protected abstract Result ConvertResult(Result result);
+    }
+
+    // ReSharper disable once InconsistentNaming
+    public abstract class IResultConvertFileSystem : IFileSystem
+    {
+        protected ReferenceCountedDisposable<IFileSystem> BaseFileSystem;
+
+        protected IResultConvertFileSystem(ref ReferenceCountedDisposable<IFileSystem> baseFileSystem)
+        {
+            BaseFileSystem = Shared.Move(ref baseFileSystem);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                BaseFileSystem?.Dispose();
+                BaseFileSystem = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        protected override Result DoCreateFile(U8Span path, long size, CreateFileOptions option)
+        {
+            return ConvertResult(BaseFileSystem.Target.CreateFile(path, size, option));
+        }
+
+        protected override Result DoDeleteFile(U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.DeleteFile(path));
+        }
+
+        protected override Result DoCreateDirectory(U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.CreateDirectory(path));
+        }
+
+        protected override Result DoDeleteDirectory(U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.DeleteDirectory(path));
+        }
+
+        protected override Result DoDeleteDirectoryRecursively(U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.DeleteDirectoryRecursively(path));
+        }
+
+        protected override Result DoCleanDirectoryRecursively(U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.CleanDirectoryRecursively(path));
+        }
+
+        protected override Result DoRenameFile(U8Span oldPath, U8Span newPath)
+        {
+            return ConvertResult(BaseFileSystem.Target.RenameFile(oldPath, newPath));
+        }
+
+        protected override Result DoRenameDirectory(U8Span oldPath, U8Span newPath)
+        {
+            return ConvertResult(BaseFileSystem.Target.RenameDirectory(oldPath, newPath));
+        }
+
+        protected override Result DoGetEntryType(out DirectoryEntryType entryType, U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.GetEntryType(out entryType, path));
+        }
+
+        protected abstract override Result DoOpenFile(out IFile file, U8Span path, OpenMode mode);
+
+        protected abstract override Result DoOpenDirectory(out IDirectory directory, U8Span path,
+            OpenDirectoryMode mode);
+
+        protected override Result DoCommit()
+        {
+            return ConvertResult(BaseFileSystem.Target.Commit());
+        }
+
+        protected override Result DoCommitProvisionally(long counter)
+        {
+            return ConvertResult(BaseFileSystem.Target.CommitProvisionally(counter));
+        }
+
+        protected override Result DoRollback()
+        {
+            return ConvertResult(BaseFileSystem.Target.Rollback());
+        }
+
+        protected override Result DoFlush()
+        {
+            return ConvertResult(BaseFileSystem.Target.Flush());
+        }
+
+        protected override Result DoGetFileTimeStampRaw(out FileTimeStampRaw timeStamp, U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.GetFileTimeStampRaw(out timeStamp, path));
+        }
+
+        protected override Result DoQueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, QueryId queryId,
+            U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.QueryEntry(outBuffer, inBuffer, queryId, path));
+        }
+
+        protected override Result DoGetFreeSpaceSize(out long freeSpace, U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.GetFreeSpaceSize(out freeSpace, path));
+        }
+
+        protected override Result DoGetTotalSpaceSize(out long totalSpace, U8Span path)
+        {
+            return ConvertResult(BaseFileSystem.Target.GetTotalSpaceSize(out totalSpace, path));
+        }
+
+        protected abstract Result ConvertResult(Result result);
+    }
+}
\ No newline at end of file
diff --git a/src/LibHac/FsSrv/Impl/SaveDataResultConvertFileSystem.cs b/src/LibHac/FsSrv/Impl/SaveDataResultConvertFileSystem.cs
index 5649416f..0b2741f9 100644
--- a/src/LibHac/FsSrv/Impl/SaveDataResultConvertFileSystem.cs
+++ b/src/LibHac/FsSrv/Impl/SaveDataResultConvertFileSystem.cs
@@ -1,6 +1,7 @@
 using LibHac.Common;
 using LibHac.Diag;
 using LibHac.Fs;
+using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 
 namespace LibHac.FsSrv.Impl
@@ -125,6 +126,84 @@ namespace LibHac.FsSrv.Impl
         }
     }
 
+    /// <summary>
+    /// Wraps an <see cref="IFile"/>, converting its returned <see cref="Result"/>s
+    /// to save-data-specific <see cref="Result"/>s.
+    /// </summary>
+    public class SaveDataResultConvertFile : IResultConvertFile
+    {
+        public SaveDataResultConvertFile(IFile baseFile) : base(baseFile)
+        {
+        }
+
+        protected override Result ConvertResult(Result result)
+        {
+            return SaveDataResultConvert.ConvertSaveFsDriverPublicResult(result);
+        }
+    }
+
+    /// <summary>
+    /// Wraps an <see cref="IDirectory"/>, converting its returned <see cref="Result"/>s
+    /// to save-data-specific <see cref="Result"/>s.
+    /// </summary>
+    public class SaveDataResultConvertDirectory : IResultConvertDirectory
+    {
+        public SaveDataResultConvertDirectory(IDirectory baseDirectory) : base(baseDirectory)
+        {
+        }
+
+        protected override Result ConvertResult(Result result)
+        {
+            return SaveDataResultConvert.ConvertSaveFsDriverPublicResult(result);
+        }
+    }
+
+    /// <summary>
+    /// Wraps an <see cref="IFileSystem"/>, converting its returned <see cref="Result"/>s
+    /// to save-data-specific <see cref="Result"/>s.
+    /// </summary>
+    public class SaveDataResultConvertFileSystem : IResultConvertFileSystem
+    {
+        public SaveDataResultConvertFileSystem(ref ReferenceCountedDisposable<IFileSystem> baseFileSystem)
+            : base(ref baseFileSystem)
+        {
+        }
+
+        public static ReferenceCountedDisposable<IFileSystem> CreateShared(
+            ref ReferenceCountedDisposable<IFileSystem> baseFileSystem)
+        {
+            var resultConvertFileSystem = new SaveDataResultConvertFileSystem(ref baseFileSystem);
+            return new ReferenceCountedDisposable<IFileSystem>(resultConvertFileSystem);
+        }
+
+        protected override Result DoOpenFile(out IFile file, U8Span path, OpenMode mode)
+        {
+            UnsafeHelpers.SkipParamInit(out file);
+
+            Result rc = ConvertResult(BaseFileSystem.Target.OpenFile(out IFile tempFile, path, mode));
+            if (rc.IsFailure()) return rc;
+
+            file = new SaveDataResultConvertFile(tempFile);
+            return Result.Success;
+        }
+
+        protected override Result DoOpenDirectory(out IDirectory directory, U8Span path, OpenDirectoryMode mode)
+        {
+            UnsafeHelpers.SkipParamInit(out directory);
+
+            Result rc = ConvertResult(BaseFileSystem.Target.OpenDirectory(out IDirectory tempDirectory, path, mode));
+            if (rc.IsFailure()) return rc;
+
+            directory = new SaveDataResultConvertDirectory(tempDirectory);
+            return Result.Success;
+        }
+
+        protected override Result ConvertResult(Result result)
+        {
+            return SaveDataResultConvert.ConvertSaveFsDriverPublicResult(result);
+        }
+    }
+
     /// <summary>
     /// Wraps an <see cref="ISaveDataExtraDataAccessor"/>, converting its returned <see cref="Result"/>s
     /// to save-data-specific <see cref="Result"/>s.