diff --git a/doc/MODULES.md b/doc/LIST-OF-MODULES.md
similarity index 100%
rename from doc/MODULES.md
rename to doc/LIST-OF-MODULES.md
diff --git a/doc/MODULE_MIGRATION.md b/doc/MODULE_MIGRATION.md
deleted file mode 100644
index 8e8e9bf..0000000
--- a/doc/MODULE_MIGRATION.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Migration of modules
-
-- bumblebee.util.which has been replaced with shutil.which
-- bumblebee.engine.Module has been replaced with core.module.Module
-- module __init__ has less parameters
-- super() works differently
-- engine.input.register_callback is now core.input.register
-- update() only has a single parameter (self) (no widgets anymore)
-- bumblebee.util.format stuff moved into util.format (byte, aslist, asbool, etc.)
-- util.format.duration -> shorten -> compact, suffix -> unit
diff --git a/doc/HOWTO_MODULE.md b/doc/development/WRITING-A-MODULE.md
similarity index 100%
rename from doc/HOWTO_MODULE.md
rename to doc/development/WRITING-A-MODULE.md
diff --git a/doc/HOWTO_THEME.md b/doc/development/WRITING-A-THEME.md
similarity index 100%
rename from doc/HOWTO_THEME.md
rename to doc/development/WRITING-A-THEME.md
diff --git a/doc/NOTES.md b/doc/other/NOTES.md
similarity index 100%
rename from doc/NOTES.md
rename to doc/other/NOTES.md