diff --git a/format/desktop_entry/README b/format/xdg/ini/README
similarity index 86%
rename from format/desktop_entry/README
rename to format/xdg/ini/README
index 3df32e2..551826c 100644
--- a/format/desktop_entry/README
+++ b/format/xdg/ini/README
@@ -1,4 +1,4 @@
-The desktop_entry module implements the basic format used by the XDG Desktop
+The ini module implements the basic INI-like format used by the XDG Desktop
 Entry Specification as described in
 (https://specifications.freedesktop.org/desktop-entry-spec/latest). Since other
 specifications make use of the basic desktop entry format (but with different
diff --git a/format/desktop_entry/error.ha b/format/xdg/ini/error.ha
similarity index 100%
rename from format/desktop_entry/error.ha
rename to format/xdg/ini/error.ha
diff --git a/format/desktop_entry/line.ha b/format/xdg/ini/line.ha
similarity index 100%
rename from format/desktop_entry/line.ha
rename to format/xdg/ini/line.ha
diff --git a/format/desktop_entry/scan.ha b/format/xdg/ini/scan.ha
similarity index 100%
rename from format/desktop_entry/scan.ha
rename to format/xdg/ini/scan.ha
diff --git a/format/desktop_entry/scan_test.ha b/format/xdg/ini/scan_test.ha
similarity index 100%
rename from format/desktop_entry/scan_test.ha
rename to format/xdg/ini/scan_test.ha
diff --git a/format/desktop_entry/test_data/foo.desktop b/format/xdg/ini/test_data/foo.desktop
similarity index 100%
rename from format/desktop_entry/test_data/foo.desktop
rename to format/xdg/ini/test_data/foo.desktop
diff --git a/format/desktop_entry/test_data/foo_full.desktop b/format/xdg/ini/test_data/foo_full.desktop
similarity index 100%
rename from format/desktop_entry/test_data/foo_full.desktop
rename to format/xdg/ini/test_data/foo_full.desktop
diff --git a/format/desktop_entry/value.ha b/format/xdg/ini/value.ha
similarity index 100%
rename from format/desktop_entry/value.ha
rename to format/xdg/ini/value.ha
diff --git a/format/desktop_entry/value_test.ha b/format/xdg/ini/value_test.ha
similarity index 100%
rename from format/desktop_entry/value_test.ha
rename to format/xdg/ini/value_test.ha