diff --git a/docs/ich9-ehci-uhci.cfg b/docs/config/ich9-ehci-uhci.cfg
similarity index 100%
rename from docs/ich9-ehci-uhci.cfg
rename to docs/config/ich9-ehci-uhci.cfg
diff --git a/docs/mach-virt-graphical.cfg b/docs/config/mach-virt-graphical.cfg
similarity index 100%
rename from docs/mach-virt-graphical.cfg
rename to docs/config/mach-virt-graphical.cfg
diff --git a/docs/mach-virt-serial.cfg b/docs/config/mach-virt-serial.cfg
similarity index 100%
rename from docs/mach-virt-serial.cfg
rename to docs/config/mach-virt-serial.cfg
diff --git a/docs/q35-emulated.cfg b/docs/config/q35-emulated.cfg
similarity index 100%
rename from docs/q35-emulated.cfg
rename to docs/config/q35-emulated.cfg
diff --git a/docs/q35-virtio-graphical.cfg b/docs/config/q35-virtio-graphical.cfg
similarity index 100%
rename from docs/q35-virtio-graphical.cfg
rename to docs/config/q35-virtio-graphical.cfg
diff --git a/docs/q35-virtio-serial.cfg b/docs/config/q35-virtio-serial.cfg
similarity index 100%
rename from docs/q35-virtio-serial.cfg
rename to docs/config/q35-virtio-serial.cfg
diff --git a/docs/atomics.txt b/docs/devel/atomics.txt
similarity index 100%
rename from docs/atomics.txt
rename to docs/devel/atomics.txt
diff --git a/docs/bitmaps.md b/docs/devel/bitmaps.md
similarity index 100%
rename from docs/bitmaps.md
rename to docs/devel/bitmaps.md
diff --git a/docs/blkdebug.txt b/docs/devel/blkdebug.txt
similarity index 100%
rename from docs/blkdebug.txt
rename to docs/devel/blkdebug.txt
diff --git a/docs/blkverify.txt b/docs/devel/blkverify.txt
similarity index 100%
rename from docs/blkverify.txt
rename to docs/devel/blkverify.txt
diff --git a/docs/build-system.txt b/docs/devel/build-system.txt
similarity index 100%
rename from docs/build-system.txt
rename to docs/devel/build-system.txt
diff --git a/docs/lockcnt.txt b/docs/devel/lockcnt.txt
similarity index 100%
rename from docs/lockcnt.txt
rename to docs/devel/lockcnt.txt
diff --git a/docs/memory.txt b/docs/devel/memory.txt
similarity index 100%
rename from docs/memory.txt
rename to docs/devel/memory.txt
diff --git a/docs/migration.txt b/docs/devel/migration.txt
similarity index 100%
rename from docs/migration.txt
rename to docs/devel/migration.txt
diff --git a/docs/multi-thread-tcg.txt b/docs/devel/multi-thread-tcg.txt
similarity index 100%
rename from docs/multi-thread-tcg.txt
rename to docs/devel/multi-thread-tcg.txt
diff --git a/docs/multiple-iothreads.txt b/docs/devel/multiple-iothreads.txt
similarity index 100%
rename from docs/multiple-iothreads.txt
rename to docs/devel/multiple-iothreads.txt
diff --git a/docs/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt
similarity index 100%
rename from docs/qapi-code-gen.txt
rename to docs/devel/qapi-code-gen.txt
diff --git a/docs/rcu.txt b/docs/devel/rcu.txt
similarity index 100%
rename from docs/rcu.txt
rename to docs/devel/rcu.txt
diff --git a/docs/tracing.txt b/docs/devel/tracing.txt
similarity index 100%
rename from docs/tracing.txt
rename to docs/devel/tracing.txt
diff --git a/docs/virtio-migration.txt b/docs/devel/virtio-migration.txt
similarity index 100%
rename from docs/virtio-migration.txt
rename to docs/devel/virtio-migration.txt
diff --git a/docs/writing-qmp-commands.txt b/docs/devel/writing-qmp-commands.txt
similarity index 100%
rename from docs/writing-qmp-commands.txt
rename to docs/devel/writing-qmp-commands.txt
diff --git a/docs/aio_notify.promela b/docs/spin/aio_notify.promela
similarity index 100%
rename from docs/aio_notify.promela
rename to docs/spin/aio_notify.promela
diff --git a/docs/aio_notify_accept.promela b/docs/spin/aio_notify_accept.promela
similarity index 100%
rename from docs/aio_notify_accept.promela
rename to docs/spin/aio_notify_accept.promela
diff --git a/docs/aio_notify_bug.promela b/docs/spin/aio_notify_bug.promela
similarity index 100%
rename from docs/aio_notify_bug.promela
rename to docs/spin/aio_notify_bug.promela
diff --git a/docs/tcg-exclusive.promela b/docs/spin/tcg-exclusive.promela
similarity index 100%
rename from docs/tcg-exclusive.promela
rename to docs/spin/tcg-exclusive.promela
diff --git a/docs/win32-qemu-event.promela b/docs/spin/win32-qemu-event.promela
similarity index 100%
rename from docs/win32-qemu-event.promela
rename to docs/spin/win32-qemu-event.promela