diff --git a/index/ad/ada_fuse.toml b/index/ad/ada_fuse/ada_fuse-1.0.0.toml
similarity index 67%
rename from index/ad/ada_fuse.toml
rename to index/ad/ada_fuse/ada_fuse-1.0.0.toml
index 3eab7ebe..27273e16 100644
--- a/index/ad/ada_fuse.toml
+++ b/index/ad/ada_fuse/ada_fuse-1.0.0.toml
@@ -1,4 +1,5 @@
-[general]
+name = "ada_fuse"
+version = "1.0.0"
 description = "Ada bindings for Fuse (Filesystem in Userspace)"
 website = "https://github.com/medsec/ada-fuse"
 authors  = [
@@ -13,22 +14,22 @@ maintainers-logins = [
 licenses = ["GPL 3.0"]
 project-files = ["ada_fuse.gpr"]
 
-[general.gpr-externals]
+[gpr-externals]
 ADA_FUSE_SYSTEM = ["Linux x86_64", "Linux i386", "Darwin i386", "Darwin x86_64"]
 
-[general.gpr-set-externals.'case(os)']
+[gpr-set-externals.'case(os)']
 linux = { ADA_FUSE_SYSTEM = "Linux x86_64" }
 macos = { ADA_FUSE_SYSTEM = "Darwin x86_64" }
 
-[general.available.'case(os)']
+[available.'case(os)']
 linux   = true
 macos   = true
 windows = false
 '...'   = false
 
-["1.0.0"]
-origin = "https://github.com/medsec/ada-fuse/archive/v1.0.zip"
-origin-hashes = ["sha512:8e67aaa8f57b688231e7d2cda0d02093c8d1d3c9a47729af613c95a1262f5ef24af0196a83b6d5c74bc43097846a514ce11c5d680ef74b8f31526752c239a11a"]
+[origin]
+url = "https://github.com/medsec/ada-fuse/archive/v1.0.zip"
+hashes = ["sha512:8e67aaa8f57b688231e7d2cda0d02093c8d1d3c9a47729af613c95a1262f5ef24af0196a83b6d5c74bc43097846a514ce11c5d680ef74b8f31526752c239a11a"]
 
-["1.0.0".depends-on]
+[[depends-on]]
 libfuse = "^2.0.0"
diff --git a/index/index.toml b/index/index.toml
index 7c969026..e801f1bf 100644
--- a/index/index.toml
+++ b/index/index.toml
@@ -1 +1 @@
-version = "0.2"
+version = "0.4"
diff --git a/index/li/libfuse.toml b/index/li/libfuse/libfuse-external.toml
similarity index 94%
rename from index/li/libfuse.toml
rename to index/li/libfuse/libfuse-external.toml
index fc391fc1..7de67e07 100644
--- a/index/li/libfuse.toml
+++ b/index/li/libfuse/libfuse-external.toml
@@ -1,4 +1,4 @@
-[general]
+name = "libfuse"
 description = "Interface for userspace programs to export a filesystem"
 licenses = ["LGPL 2.1"]
 maintainers = ["nicolai.ruckel@uni-weimar.de"]