diff --git a/Aaru.Tests/Filesystems/AFFS.cs b/Aaru.Tests/Filesystems/AFFS/AFFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/AFFS.cs
rename to Aaru.Tests/Filesystems/AFFS/AFFS.cs
diff --git a/Aaru.Tests/Filesystems/AFFS2.cs b/Aaru.Tests/Filesystems/AFFS2/AFFS2.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/AFFS2.cs
rename to Aaru.Tests/Filesystems/AFFS2/AFFS2.cs
diff --git a/Aaru.Tests/Filesystems/AOFS.cs b/Aaru.Tests/Filesystems/AOFS/AOFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/AOFS.cs
rename to Aaru.Tests/Filesystems/AOFS/AOFS.cs
diff --git a/Aaru.Tests/Filesystems/BeFS.cs b/Aaru.Tests/Filesystems/BeFS/BeFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/BeFS.cs
rename to Aaru.Tests/Filesystems/BeFS/BeFS.cs
diff --git a/Aaru.Tests/Filesystems/COHERENT.cs b/Aaru.Tests/Filesystems/COHERENT/COHERENT.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/COHERENT.cs
rename to Aaru.Tests/Filesystems/COHERENT/COHERENT.cs
diff --git a/Aaru.Tests/Filesystems/DTFS.cs b/Aaru.Tests/Filesystems/DTFS/DTFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/DTFS.cs
rename to Aaru.Tests/Filesystems/DTFS/DTFS.cs
diff --git a/Aaru.Tests/Filesystems/EAFS.cs b/Aaru.Tests/Filesystems/EAFS/EAFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/EAFS.cs
rename to Aaru.Tests/Filesystems/EAFS/EAFS.cs
diff --git a/Aaru.Tests/Filesystems/FAT12.cs b/Aaru.Tests/Filesystems/FAT12/FAT12.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/FAT12.cs
rename to Aaru.Tests/Filesystems/FAT12/FAT12.cs
diff --git a/Aaru.Tests/Filesystems/FAT16.cs b/Aaru.Tests/Filesystems/FAT16/FAT16.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/FAT16.cs
rename to Aaru.Tests/Filesystems/FAT16/FAT16.cs
diff --git a/Aaru.Tests/Filesystems/FAT32.cs b/Aaru.Tests/Filesystems/FAT32/FAT32.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/FAT32.cs
rename to Aaru.Tests/Filesystems/FAT32/FAT32.cs
diff --git a/Aaru.Tests/Filesystems/FATX.cs b/Aaru.Tests/Filesystems/FATX/FATX.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/FATX.cs
rename to Aaru.Tests/Filesystems/FATX/FATX.cs
diff --git a/Aaru.Tests/Filesystems/HFSPlus.cs b/Aaru.Tests/Filesystems/HFS+/HFSPlus.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/HFSPlus.cs
rename to Aaru.Tests/Filesystems/HFS+/HFSPlus.cs
diff --git a/Aaru.Tests/Filesystems/HFS.cs b/Aaru.Tests/Filesystems/HFS/HFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/HFS.cs
rename to Aaru.Tests/Filesystems/HFS/HFS.cs
diff --git a/Aaru.Tests/Filesystems/HFSX.cs b/Aaru.Tests/Filesystems/HFSX/HFSX.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/HFSX.cs
rename to Aaru.Tests/Filesystems/HFSX/HFSX.cs
diff --git a/Aaru.Tests/Filesystems/HTFS.cs b/Aaru.Tests/Filesystems/HTFS/HTFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/HTFS.cs
rename to Aaru.Tests/Filesystems/HTFS/HTFS.cs
diff --git a/Aaru.Tests/Filesystems/MINIX.cs b/Aaru.Tests/Filesystems/MINIX/MINIX.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/MINIX.cs
rename to Aaru.Tests/Filesystems/MINIX/MINIX.cs
diff --git a/Aaru.Tests/Filesystems/NTFS.cs b/Aaru.Tests/Filesystems/NTFS/NTFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/NTFS.cs
rename to Aaru.Tests/Filesystems/NTFS/NTFS.cs
diff --git a/Aaru.Tests/Filesystems/ProDOS.cs b/Aaru.Tests/Filesystems/ProDOS/ProDOS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/ProDOS.cs
rename to Aaru.Tests/Filesystems/ProDOS/ProDOS.cs
diff --git a/Aaru.Tests/Filesystems/QNX4.cs b/Aaru.Tests/Filesystems/QNX4/QNX4.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/QNX4.cs
rename to Aaru.Tests/Filesystems/QNX4/QNX4.cs
diff --git a/Aaru.Tests/Filesystems/SFS.cs b/Aaru.Tests/Filesystems/SFS/SFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/SFS.cs
rename to Aaru.Tests/Filesystems/SFS/SFS.cs
diff --git a/Aaru.Tests/Filesystems/SysV.cs b/Aaru.Tests/Filesystems/SysV/SysV.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/SysV.cs
rename to Aaru.Tests/Filesystems/SysV/SysV.cs
diff --git a/Aaru.Tests/Filesystems/UDF.cs b/Aaru.Tests/Filesystems/UDF/UDF.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/UDF.cs
rename to Aaru.Tests/Filesystems/UDF/UDF.cs
diff --git a/Aaru.Tests/Filesystems/UNIXBFS.cs b/Aaru.Tests/Filesystems/UNIXBFS/UNIXBFS.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/UNIXBFS.cs
rename to Aaru.Tests/Filesystems/UNIXBFS/UNIXBFS.cs
diff --git a/Aaru.Tests/Filesystems/XENIX.cs b/Aaru.Tests/Filesystems/XENIX/XENIX.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/XENIX.cs
rename to Aaru.Tests/Filesystems/XENIX/XENIX.cs
diff --git a/Aaru.Tests/Filesystems/exFAT.cs b/Aaru.Tests/Filesystems/exFAT/exFAT.cs
similarity index 100%
rename from Aaru.Tests/Filesystems/exFAT.cs
rename to Aaru.Tests/Filesystems/exFAT/exFAT.cs