diff --git a/CMakeLists.txt b/CMakeLists.txt
index 618b08d3..c5725ff0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,8 @@ set(PICA_SOURCE_FILES src/core/PICA/gpu.cpp src/core/PICA/regs.cpp src/core/PICA
 
 set(LOADER_SOURCE_FILES src/core/loader/elf.cpp src/core/loader/ncsd.cpp src/core/loader/ncch.cpp src/core/loader/lz77.cpp)
 set(FS_SOURCE_FILES src/core/fs/archive_self_ncch.cpp src/core/fs/archive_save_data.cpp src/core/fs/archive_sdmc.cpp
-                    src/core/fs/archive_ext_save_data.cpp src/core/fs/archive_ncch.cpp
+                    src/core/fs/archive_ext_save_data.cpp src/core/fs/archive_ncch.cpp src/core/fs/romfs.cpp
+                    src/core/fs/ivfc.cpp
 )
 
 set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
@@ -156,6 +157,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp
                  include/config.hpp include/services/ir_user.hpp include/http_server.hpp include/cheats.hpp
                  include/action_replay.hpp include/renderer_sw/renderer_sw.hpp include/compiler_builtins.hpp
+                 include/fs/romfs.hpp include/fs/ivfc.hpp
 )
 
 set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp
diff --git a/include/fs/ivfc.hpp b/include/fs/ivfc.hpp
new file mode 100644
index 00000000..bb5724be
--- /dev/null
+++ b/include/fs/ivfc.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <vector>
+
+#include "helpers.hpp"
+
+namespace IVFC {
+	struct IVFCLevel {
+		u64 logicalOffset;
+		u64 size;
+		u64 blockSize;
+	};
+
+	struct IVFC {
+		u64 masterHashSize;
+		std::vector<IVFCLevel> levels;
+	};
+
+	size_t parseIVFC(uintptr_t ivfcStart, IVFC& ivfc);
+}  // namespace IVFC
\ No newline at end of file
diff --git a/include/fs/romfs.hpp b/include/fs/romfs.hpp
new file mode 100644
index 00000000..20213761
--- /dev/null
+++ b/include/fs/romfs.hpp
@@ -0,0 +1,22 @@
+#pragma once
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "helpers.hpp"
+
+namespace RomFS {
+	struct RomFSNode {
+		std::u16string name;
+		// The file/directory offset relative to the start of the RomFS
+		u64 metadataOffset = 0;
+		u64 dataOffset = 0;
+		u64 dataSize = 0;
+		bool isDirectory = false;
+
+		std::vector<std::unique_ptr<RomFSNode>> directories;
+		std::vector<std::unique_ptr<RomFSNode>> files;
+	};
+
+	std::unique_ptr<RomFSNode> parseRomFSTree(uintptr_t romFS, u64 romFSSize);
+}  // namespace RomFS
\ No newline at end of file
diff --git a/src/core/fs/ivfc.cpp b/src/core/fs/ivfc.cpp
new file mode 100644
index 00000000..78e50f29
--- /dev/null
+++ b/src/core/fs/ivfc.cpp
@@ -0,0 +1,76 @@
+#include "fs/ivfc.hpp"
+
+namespace IVFC {
+	size_t parseIVFC(uintptr_t ivfcStart, IVFC& ivfc) {
+		uintptr_t ivfcPointer = ivfcStart;
+
+		char* ivfcCharPtr = (char*)ivfcPointer;
+		if (ivfcCharPtr[0] != 'I' || ivfcCharPtr[1] != 'V' || ivfcCharPtr[2] != 'F' || ivfcCharPtr[3] != 'C') {
+			printf("Invalid header on IVFC\n");
+			return 0;
+		}
+		ivfcPointer += 4;
+
+		u32 magicIdentifier = *(u32*)ivfcPointer;
+		ivfcPointer += 4;
+
+		// RomFS IVFC uses 0x10000, DISA/DIFF IVFC uses 0x20000 here
+		if (magicIdentifier != 0x10000 && magicIdentifier != 0x20000) {
+			printf("Invalid IVFC magic identifier: %08X\n", magicIdentifier);
+			return 0;
+		}
+
+		if (magicIdentifier == 0x10000) {
+			ivfc.masterHashSize = *(u32*)ivfcPointer;
+			ivfcPointer += 4;
+			// RomFS IVFC uses 3 levels
+			ivfc.levels.resize(3);
+		} else {
+			ivfc.masterHashSize = *(u64*)ivfcPointer;
+			ivfcPointer += 8;
+			// DISA/DIFF IVFC uses 4 levels
+			ivfc.levels.resize(4);
+		}
+
+		for (size_t i = 0; i < ivfc.levels.size(); i++) {
+			IVFCLevel level;
+
+			level.logicalOffset = *(u64*)ivfcPointer;
+			ivfcPointer += 8;
+
+			level.size = *(u64*)ivfcPointer;
+			ivfcPointer += 8;
+
+			// This field is in log2
+			level.blockSize = 1 << *(u32*)ivfcPointer;
+			ivfcPointer += 4;
+
+			// Skip 4 reserved bytes
+			ivfcPointer += 4;
+
+			ivfc.levels[i] = level;
+		}
+
+		u64 ivfcDescriptorSize = *(u64*)ivfcPointer;
+		ivfcPointer += 8;
+
+		uintptr_t ivfcActualSize = ivfcPointer - ivfcStart;
+
+		// According to 3DBrew, this is usually the case but not guaranteed
+		if (ivfcActualSize != ivfcDescriptorSize) {
+			printf("IVFC descriptor size mismatch: %lx != %lx\n", ivfcActualSize, ivfcDescriptorSize);
+		}
+
+		if (magicIdentifier == 0x10000 && ivfcActualSize != 0x5C) {
+			// This is always 0x5C bytes long
+			printf("Invalid IVFC size: %08x\n", (u32)ivfcActualSize);
+			return 0;
+		} else if (magicIdentifier == 0x20000 && ivfcActualSize != 0x78) {
+			// This is always 0x78 bytes long
+			printf("Invalid IVFC size: %08x\n", (u32)ivfcActualSize);
+			return 0;
+		}
+
+		return ivfcActualSize;
+	}
+}  // namespace IVFC
\ No newline at end of file
diff --git a/src/core/fs/romfs.cpp b/src/core/fs/romfs.cpp
new file mode 100644
index 00000000..1c826b19
--- /dev/null
+++ b/src/core/fs/romfs.cpp
@@ -0,0 +1,194 @@
+#include "fs/romfs.hpp"
+
+#include <cstdio>
+#include <queue>
+#include <string>
+
+#include "fs/ivfc.hpp"
+#include "helpers.hpp"
+
+namespace RomFS {
+	constexpr u32 metadataInvalidEntry = 0xFFFFFFFF;
+
+	struct Level3Header {
+		u32 headerSize;
+		u32 directoryHashTableOffset;
+		u32 directoryHashTableSize;
+		u32 directoryMetadataOffset;
+		u32 directoryMetadataSize;
+		u32 fileHashTableOffset;
+		u32 fileHashTableSize;
+		u32 fileMetadataOffset;
+		u32 fileMetadataSize;
+		u32 fileDataOffset;
+	};
+
+	inline constexpr uintptr_t alignUp(uintptr_t value, uintptr_t alignment) {
+		if (value % alignment == 0) return value;
+
+		return value + (alignment - (value % alignment));
+	}
+
+	void printNode(const RomFSNode& node, int indentation) {
+		for (int i = 0; i < indentation; i++) {
+			printf("  ");
+		}
+		printf("%s/\n", std::string(node.name.begin(), node.name.end()).c_str());
+
+		for (auto& file : node.files) {
+			for (int i = 0; i <= indentation; i++) {
+				printf("  ");
+			}
+			printf("%s\n", std::string(file->name.begin(), file->name.end()).c_str());
+		}
+
+		indentation++;
+		for (auto& directory : node.directories) {
+			printNode(*directory, indentation);
+		}
+		indentation--;
+	}
+
+	std::vector<std::unique_ptr<RomFSNode>> getFiles(uintptr_t fileMetadataBase, u32 currentFileOffset) {
+		std::vector<std::unique_ptr<RomFSNode>> files;
+
+		while (currentFileOffset != metadataInvalidEntry) {
+			u32* metadataPtr = (u32*)(fileMetadataBase + currentFileOffset);
+			metadataPtr++;  // Skip the containing directory
+			u32 nextFileOffset = *metadataPtr++;
+			u64 fileDataOffset = *(u64*)metadataPtr;
+			metadataPtr += 2;
+			u64 fileSize = *(u64*)metadataPtr;
+			metadataPtr += 2;
+			metadataPtr++;  // Skip the offset of the next file in the same hash table bucket
+			u32 nameLength = *metadataPtr++ / 2;
+
+			// Arbitrary limit
+			if (nameLength > 128) {
+				printf("Invalid file name length: %08X\n", nameLength);
+				return {};
+			}
+
+			char16_t* namePtr = (char16_t*)metadataPtr;
+			std::u16string name(namePtr, nameLength);
+
+			std::unique_ptr file = std::make_unique<RomFSNode>();
+			file->isDirectory = false;
+			file->name = name;
+			file->metadataOffset = currentFileOffset;
+			file->dataOffset = fileDataOffset;
+			file->dataSize = fileSize;
+
+			files.push_back(std::move(file));
+
+			currentFileOffset = nextFileOffset;
+		}
+
+		return files;
+	}
+
+	std::unique_ptr<RomFSNode> parseRootDirectory(uintptr_t directoryMetadataBase, uintptr_t fileMetadataBase) {
+		std::unique_ptr<RomFSNode> rootDirectory = std::make_unique<RomFSNode>();
+		rootDirectory->isDirectory = true;
+		rootDirectory->name = u"romfs:";
+		rootDirectory->metadataOffset = 0;
+
+		u32 rootFilesOffset = *((u32*)(directoryMetadataBase) + 3);
+		if (rootFilesOffset != metadataInvalidEntry) {
+			rootDirectory->files = getFiles(fileMetadataBase, rootFilesOffset);
+		}
+
+		std::queue<RomFSNode*> directoryOffsets;
+		directoryOffsets.push(rootDirectory.get());
+
+		while (!directoryOffsets.empty()) {
+			RomFSNode* currentNode = directoryOffsets.front();
+			directoryOffsets.pop();
+
+			u32* metadataPtr = (u32*)(directoryMetadataBase + currentNode->metadataOffset);
+			metadataPtr += 2;
+
+			// Offset of first child directory
+			u32 currentDirectoryOffset = *metadataPtr;
+
+			// Loop over all the sibling directories of the first child to get all the children directories
+			// of the current directory
+			while (currentDirectoryOffset != metadataInvalidEntry) {
+				metadataPtr = (u32*)(directoryMetadataBase + currentDirectoryOffset);
+				metadataPtr++;  // Skip the parent offset
+				u32 siblingDirectoryOffset = *metadataPtr++;
+				metadataPtr++;  // Skip offset of first child directory
+				u32 currentFileOffset = *metadataPtr++;
+				metadataPtr++;  // Skip offset of next directory in the same hash table bucket
+				u32 nameLength = *metadataPtr++ / 2;
+
+				// Arbitrary limit
+				if (nameLength > 128) {
+					printf("Invalid directory name length: %08X\n", nameLength);
+					return {};
+				}
+
+				char16_t* namePtr = (char16_t*)metadataPtr;
+				std::u16string name(namePtr, nameLength);
+
+				std::unique_ptr directory = std::make_unique<RomFSNode>();
+				directory->isDirectory = true;
+				directory->name = name;
+				directory->metadataOffset = currentDirectoryOffset;
+				directory->files = getFiles(fileMetadataBase, currentFileOffset);
+
+				currentNode->directories.push_back(std::move(directory));
+				currentDirectoryOffset = siblingDirectoryOffset;
+			}
+
+			for (auto& directory : currentNode->directories) {
+				directoryOffsets.push(directory.get());
+			}
+		}
+
+		return rootDirectory;
+	}
+
+	std::unique_ptr<RomFSNode> parseRomFSTree(uintptr_t romFS, u64 romFSSize) {
+		IVFC::IVFC ivfc;
+		size_t ivfcSize = IVFC::parseIVFC((uintptr_t)romFS, ivfc);
+
+		if (ivfcSize == 0) {
+			printf("Failed to parse IVFC\n");
+			return {};
+		}
+
+		uintptr_t masterHashOffset = RomFS::alignUp(ivfcSize, 0x10);
+		// From GBATEK:
+		// The "Logical Offsets" are completely unrelated to the physical offsets in the RomFS partition.
+		// Instead, the "Logical Offsets" might be something about where to map the Level 1-3 sections in
+		// virtual memory (with the physical Level 3,1,2 ordering being re-ordered to Level 1,2,3)?
+		uintptr_t level3Offset = RomFS::alignUp(masterHashOffset + ivfc.masterHashSize, ivfc.levels[2].blockSize);
+		uintptr_t level3Base = (uintptr_t)romFS + level3Offset;
+		u32* level3Ptr = (u32*)level3Base;
+
+		Level3Header header;
+		header.headerSize = *level3Ptr++;
+		header.directoryHashTableOffset = *level3Ptr++;
+		header.directoryHashTableSize = *level3Ptr++;
+		header.directoryMetadataOffset = *level3Ptr++;
+		header.directoryMetadataSize = *level3Ptr++;
+		header.fileHashTableOffset = *level3Ptr++;
+		header.fileHashTableSize = *level3Ptr++;
+		header.fileMetadataOffset = *level3Ptr++;
+		header.fileMetadataSize = *level3Ptr++;
+		header.fileDataOffset = *level3Ptr;
+
+		if (header.headerSize != 0x28) {
+			printf("Invalid level 3 header size: %08X\n", header.headerSize);
+			return {};
+		}
+
+		std::unique_ptr<RomFSNode> root = parseRootDirectory(level3Base + header.directoryMetadataOffset, level3Base + header.fileMetadataOffset);
+
+		// If you want to print the tree, uncomment this
+		// printNode(*root, 0);
+
+		return root;
+	}
+}  // namespace RomFS
\ No newline at end of file