diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91593303..cb347a2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ add_subdirectory(signals)
 # TODO: disable by default
 option(AW_ENABLE_HUDF "Enable HuDF data format" OFF)
 if (AW_ENABLE_HUDF)
-	add_subdirectory(hudf)
+	add_subdirectory(fileformat/hudf)
 endif()
 
 # Libraries with extra dependencies
@@ -94,7 +94,7 @@ endif()
 
 option(AW_ENABLE_SOUND "Enable libawsound" OFF)
 if (AW_ENABLE_SOUND)
-	add_subdirectory(sound)
+	add_subdirectory(fileformat/sound)
 endif()
 
 option(AW_ENABLE_LUA "Enable libawlua" OFF)
diff --git a/README.md b/README.md
index ba94208d..80178b95 100644
--- a/README.md
+++ b/README.md
@@ -15,15 +15,15 @@ List of libraries that are currently in this collection:
 - platform: abstraction of platform-specific functions
 - thread: multi-threading primitives
 - archive (v3): header-only serialization library
-- doc: text-based data interchange format
-- sound: simple-to-use WAV file reader
+- fileformat/hudf: text-based data interchange format
+- fileformat/sound: simple-to-use WAV file reader
 
 And a few work-in-progress libraries:
-- assert: debug assertion library, offers extended functionality compared to the standard <cassert>.
+- assert: debug assertion library, offers extended functionality compared to the standard `<cassert>`.
 - graphics: attempt at making a rendering engine.
 	- Most of available rendering libraries come with their own scene graph, resource managers, input managers, windowing, GUI and so on and so forth.
 	- I am trying to make a library that does only rendering, easy to integrate, and offers the best possible performance.
 - lua: C++ bindings for Lua
-- itd: simple and performant file archive format for games
 - gui: UI library for games
 - audio-openal: wrapper for OpenAL
+- fileformat/itd: simple and performant file archive format for games
diff --git a/hpacker/HPKHtableWriter.cpp b/fileformat/hpacker/HPKHtableWriter.cpp
similarity index 100%
rename from hpacker/HPKHtableWriter.cpp
rename to fileformat/hpacker/HPKHtableWriter.cpp
diff --git a/hpacker/HPKHtableWriter.h b/fileformat/hpacker/HPKHtableWriter.h
similarity index 100%
rename from hpacker/HPKHtableWriter.h
rename to fileformat/hpacker/HPKHtableWriter.h
diff --git a/hpacker/HPKListWriter.cpp b/fileformat/hpacker/HPKListWriter.cpp
similarity index 100%
rename from hpacker/HPKListWriter.cpp
rename to fileformat/hpacker/HPKListWriter.cpp
diff --git a/hpacker/HPKListWriter.h b/fileformat/hpacker/HPKListWriter.h
similarity index 100%
rename from hpacker/HPKListWriter.h
rename to fileformat/hpacker/HPKListWriter.h
diff --git a/hpacker/HPKTreeReader.cpp b/fileformat/hpacker/HPKTreeReader.cpp
similarity index 100%
rename from hpacker/HPKTreeReader.cpp
rename to fileformat/hpacker/HPKTreeReader.cpp
diff --git a/hpacker/HPKTreeReader.h b/fileformat/hpacker/HPKTreeReader.h
similarity index 100%
rename from hpacker/HPKTreeReader.h
rename to fileformat/hpacker/HPKTreeReader.h
diff --git a/hpacker/HPKTreeWriter.cpp b/fileformat/hpacker/HPKTreeWriter.cpp
similarity index 100%
rename from hpacker/HPKTreeWriter.cpp
rename to fileformat/hpacker/HPKTreeWriter.cpp
diff --git a/hpacker/HPKTreeWriter.h b/fileformat/hpacker/HPKTreeWriter.h
similarity index 100%
rename from hpacker/HPKTreeWriter.h
rename to fileformat/hpacker/HPKTreeWriter.h
diff --git a/hpacker/ItdPacker.cpp b/fileformat/hpacker/ItdPacker.cpp
similarity index 100%
rename from hpacker/ItdPacker.cpp
rename to fileformat/hpacker/ItdPacker.cpp
diff --git a/hpacker/ItdPacker.h b/fileformat/hpacker/ItdPacker.h
similarity index 100%
rename from hpacker/ItdPacker.h
rename to fileformat/hpacker/ItdPacker.h
diff --git a/hpacker/ItdReader.cpp b/fileformat/hpacker/ItdReader.cpp
similarity index 100%
rename from hpacker/ItdReader.cpp
rename to fileformat/hpacker/ItdReader.cpp
diff --git a/hpacker/ItdReader.h b/fileformat/hpacker/ItdReader.h
similarity index 100%
rename from hpacker/ItdReader.h
rename to fileformat/hpacker/ItdReader.h
diff --git a/hpacker/StringBank.cpp b/fileformat/hpacker/StringBank.cpp
similarity index 100%
rename from hpacker/StringBank.cpp
rename to fileformat/hpacker/StringBank.cpp
diff --git a/hpacker/StringBank.h b/fileformat/hpacker/StringBank.h
similarity index 100%
rename from hpacker/StringBank.h
rename to fileformat/hpacker/StringBank.h
diff --git a/hpacker/hpacker.cpp b/fileformat/hpacker/hpacker.cpp
similarity index 100%
rename from hpacker/hpacker.cpp
rename to fileformat/hpacker/hpacker.cpp
diff --git a/hpacker/hpacker.h b/fileformat/hpacker/hpacker.h
similarity index 100%
rename from hpacker/hpacker.h
rename to fileformat/hpacker/hpacker.h
diff --git a/hudf/CMakeLists.txt b/fileformat/hudf/CMakeLists.txt
similarity index 100%
rename from hudf/CMakeLists.txt
rename to fileformat/hudf/CMakeLists.txt
diff --git a/hudf/docs/format.md b/fileformat/hudf/docs/format.md
similarity index 100%
rename from hudf/docs/format.md
rename to fileformat/hudf/docs/format.md
diff --git a/hudf/document.c++ b/fileformat/hudf/document.c++
similarity index 100%
rename from hudf/document.c++
rename to fileformat/hudf/document.c++
diff --git a/hudf/include/aw/hudf/document.h b/fileformat/hudf/include/aw/hudf/document.h
similarity index 100%
rename from hudf/include/aw/hudf/document.h
rename to fileformat/hudf/include/aw/hudf/document.h
diff --git a/hudf/include/aw/hudf/export.h b/fileformat/hudf/include/aw/hudf/export.h
similarity index 100%
rename from hudf/include/aw/hudf/export.h
rename to fileformat/hudf/include/aw/hudf/export.h
diff --git a/hudf/include/aw/hudf/lexer.h b/fileformat/hudf/include/aw/hudf/lexer.h
similarity index 100%
rename from hudf/include/aw/hudf/lexer.h
rename to fileformat/hudf/include/aw/hudf/lexer.h
diff --git a/hudf/include/aw/hudf/node.h b/fileformat/hudf/include/aw/hudf/node.h
similarity index 100%
rename from hudf/include/aw/hudf/node.h
rename to fileformat/hudf/include/aw/hudf/node.h
diff --git a/hudf/include/aw/hudf/parser.h b/fileformat/hudf/include/aw/hudf/parser.h
similarity index 100%
rename from hudf/include/aw/hudf/parser.h
rename to fileformat/hudf/include/aw/hudf/parser.h
diff --git a/hudf/include/aw/hudf/type.h b/fileformat/hudf/include/aw/hudf/type.h
similarity index 100%
rename from hudf/include/aw/hudf/type.h
rename to fileformat/hudf/include/aw/hudf/type.h
diff --git a/hudf/include/aw/hudf/utility.h b/fileformat/hudf/include/aw/hudf/utility.h
similarity index 100%
rename from hudf/include/aw/hudf/utility.h
rename to fileformat/hudf/include/aw/hudf/utility.h
diff --git a/hudf/include/aw/hudf/value.h b/fileformat/hudf/include/aw/hudf/value.h
similarity index 100%
rename from hudf/include/aw/hudf/value.h
rename to fileformat/hudf/include/aw/hudf/value.h
diff --git a/hudf/include/aw/hudf/writer.h b/fileformat/hudf/include/aw/hudf/writer.h
similarity index 100%
rename from hudf/include/aw/hudf/writer.h
rename to fileformat/hudf/include/aw/hudf/writer.h
diff --git a/hudf/lexer.c++ b/fileformat/hudf/lexer.c++
similarity index 100%
rename from hudf/lexer.c++
rename to fileformat/hudf/lexer.c++
diff --git a/hudf/parser.c++ b/fileformat/hudf/parser.c++
similarity index 100%
rename from hudf/parser.c++
rename to fileformat/hudf/parser.c++
diff --git a/hudf/tests/CMakeLists.txt b/fileformat/hudf/tests/CMakeLists.txt
similarity index 100%
rename from hudf/tests/CMakeLists.txt
rename to fileformat/hudf/tests/CMakeLists.txt
diff --git a/hudf/tests/data/invalid.hdf b/fileformat/hudf/tests/data/invalid.hdf
similarity index 100%
rename from hudf/tests/data/invalid.hdf
rename to fileformat/hudf/tests/data/invalid.hdf
diff --git a/hudf/tests/data/messages.hdf b/fileformat/hudf/tests/data/messages.hdf
similarity index 100%
rename from hudf/tests/data/messages.hdf
rename to fileformat/hudf/tests/data/messages.hdf
diff --git a/hudf/tests/data/settings.hdf b/fileformat/hudf/tests/data/settings.hdf
similarity index 100%
rename from hudf/tests/data/settings.hdf
rename to fileformat/hudf/tests/data/settings.hdf
diff --git a/hudf/tests/data/sotank.hdf b/fileformat/hudf/tests/data/sotank.hdf
similarity index 100%
rename from hudf/tests/data/sotank.hdf
rename to fileformat/hudf/tests/data/sotank.hdf
diff --git a/hudf/tests/data/sphere5.hdf b/fileformat/hudf/tests/data/sphere5.hdf
similarity index 100%
rename from hudf/tests/data/sphere5.hdf
rename to fileformat/hudf/tests/data/sphere5.hdf
diff --git a/hudf/tests/data/test.hdf b/fileformat/hudf/tests/data/test.hdf
similarity index 100%
rename from hudf/tests/data/test.hdf
rename to fileformat/hudf/tests/data/test.hdf
diff --git a/hudf/tests/reader.c++ b/fileformat/hudf/tests/reader.c++
similarity index 100%
rename from hudf/tests/reader.c++
rename to fileformat/hudf/tests/reader.c++
diff --git a/hudf/tests/writer.c++ b/fileformat/hudf/tests/writer.c++
similarity index 100%
rename from hudf/tests/writer.c++
rename to fileformat/hudf/tests/writer.c++
diff --git a/hudf/utility.c++ b/fileformat/hudf/utility.c++
similarity index 100%
rename from hudf/utility.c++
rename to fileformat/hudf/utility.c++
diff --git a/hudf/writer.c++ b/fileformat/hudf/writer.c++
similarity index 100%
rename from hudf/writer.c++
rename to fileformat/hudf/writer.c++
diff --git a/itd/docs/itd_hpk_format.md b/fileformat/itd/docs/itd_hpk_format.md
similarity index 100%
rename from itd/docs/itd_hpk_format.md
rename to fileformat/itd/docs/itd_hpk_format.md
diff --git a/itd/include/aw/itd/HPKIndexReader.h b/fileformat/itd/include/aw/itd/HPKIndexReader.h
similarity index 100%
rename from itd/include/aw/itd/HPKIndexReader.h
rename to fileformat/itd/include/aw/itd/HPKIndexReader.h
diff --git a/itd/include/aw/itd/HPKIndexWriter.h b/fileformat/itd/include/aw/itd/HPKIndexWriter.h
similarity index 100%
rename from itd/include/aw/itd/HPKIndexWriter.h
rename to fileformat/itd/include/aw/itd/HPKIndexWriter.h
diff --git a/itd/include/aw/itd/itd.h b/fileformat/itd/include/aw/itd/itd.h
similarity index 100%
rename from itd/include/aw/itd/itd.h
rename to fileformat/itd/include/aw/itd/itd.h
diff --git a/sound/CMakeLists.txt b/fileformat/sound/CMakeLists.txt
similarity index 100%
rename from sound/CMakeLists.txt
rename to fileformat/sound/CMakeLists.txt
diff --git a/sound/chunks.h b/fileformat/sound/chunks.h
similarity index 100%
rename from sound/chunks.h
rename to fileformat/sound/chunks.h
diff --git a/sound/include/aw/fileformat/wav/data.h b/fileformat/sound/include/aw/fileformat/wav/data.h
similarity index 100%
rename from sound/include/aw/fileformat/wav/data.h
rename to fileformat/sound/include/aw/fileformat/wav/data.h
diff --git a/sound/include/aw/fileformat/wav/log.h b/fileformat/sound/include/aw/fileformat/wav/log.h
similarity index 100%
rename from sound/include/aw/fileformat/wav/log.h
rename to fileformat/sound/include/aw/fileformat/wav/log.h
diff --git a/sound/include/aw/fileformat/wav/lowlevel.h b/fileformat/sound/include/aw/fileformat/wav/lowlevel.h
similarity index 100%
rename from sound/include/aw/fileformat/wav/lowlevel.h
rename to fileformat/sound/include/aw/fileformat/wav/lowlevel.h
diff --git a/sound/include/aw/fileformat/wav/reader.h b/fileformat/sound/include/aw/fileformat/wav/reader.h
similarity index 100%
rename from sound/include/aw/fileformat/wav/reader.h
rename to fileformat/sound/include/aw/fileformat/wav/reader.h
diff --git a/sound/include/aw/sound/export.h b/fileformat/sound/include/aw/sound/export.h
similarity index 100%
rename from sound/include/aw/sound/export.h
rename to fileformat/sound/include/aw/sound/export.h
diff --git a/sound/tests/CMakeLists.txt b/fileformat/sound/tests/CMakeLists.txt
similarity index 100%
rename from sound/tests/CMakeLists.txt
rename to fileformat/sound/tests/CMakeLists.txt
diff --git a/sound/tests/glass.wav b/fileformat/sound/tests/glass.wav
similarity index 100%
rename from sound/tests/glass.wav
rename to fileformat/sound/tests/glass.wav
diff --git a/sound/tests/wav_reader.cpp b/fileformat/sound/tests/wav_reader.cpp
similarity index 100%
rename from sound/tests/wav_reader.cpp
rename to fileformat/sound/tests/wav_reader.cpp
diff --git a/sound/wav_reader.cpp b/fileformat/sound/wav_reader.cpp
similarity index 100%
rename from sound/wav_reader.cpp
rename to fileformat/sound/wav_reader.cpp