diff --git a/hledger-api/doc/hledger-api.1 b/hledger-api/hledger-api.1
similarity index 100%
rename from hledger-api/doc/hledger-api.1
rename to hledger-api/hledger-api.1
diff --git a/hledger-api/doc/hledger-api.1.info b/hledger-api/hledger-api.1.info
similarity index 100%
rename from hledger-api/doc/hledger-api.1.info
rename to hledger-api/hledger-api.1.info
diff --git a/hledger-api/doc/hledger-api.1.m4.md b/hledger-api/hledger-api.1.m4.md
similarity index 100%
rename from hledger-api/doc/hledger-api.1.m4.md
rename to hledger-api/hledger-api.1.m4.md
diff --git a/hledger-api/doc/hledger-api.1.txt b/hledger-api/hledger-api.1.txt
similarity index 100%
rename from hledger-api/doc/hledger-api.1.txt
rename to hledger-api/hledger-api.1.txt
diff --git a/hledger-lib/doc/hledger_csv.5 b/hledger-lib/hledger_csv.5
similarity index 100%
rename from hledger-lib/doc/hledger_csv.5
rename to hledger-lib/hledger_csv.5
diff --git a/hledger-lib/doc/hledger_csv.5.info b/hledger-lib/hledger_csv.5.info
similarity index 100%
rename from hledger-lib/doc/hledger_csv.5.info
rename to hledger-lib/hledger_csv.5.info
diff --git a/hledger-lib/doc/hledger_csv.5.m4.md b/hledger-lib/hledger_csv.5.m4.md
similarity index 100%
rename from hledger-lib/doc/hledger_csv.5.m4.md
rename to hledger-lib/hledger_csv.5.m4.md
diff --git a/hledger-lib/doc/hledger_csv.5.txt b/hledger-lib/hledger_csv.5.txt
similarity index 100%
rename from hledger-lib/doc/hledger_csv.5.txt
rename to hledger-lib/hledger_csv.5.txt
diff --git a/hledger-lib/doc/hledger_journal.5 b/hledger-lib/hledger_journal.5
similarity index 100%
rename from hledger-lib/doc/hledger_journal.5
rename to hledger-lib/hledger_journal.5
diff --git a/hledger-lib/doc/hledger_journal.5.info b/hledger-lib/hledger_journal.5.info
similarity index 100%
rename from hledger-lib/doc/hledger_journal.5.info
rename to hledger-lib/hledger_journal.5.info
diff --git a/hledger-lib/doc/hledger_journal.5.m4.md b/hledger-lib/hledger_journal.5.m4.md
similarity index 100%
rename from hledger-lib/doc/hledger_journal.5.m4.md
rename to hledger-lib/hledger_journal.5.m4.md
diff --git a/hledger-lib/doc/hledger_journal.5.txt b/hledger-lib/hledger_journal.5.txt
similarity index 100%
rename from hledger-lib/doc/hledger_journal.5.txt
rename to hledger-lib/hledger_journal.5.txt
diff --git a/hledger-lib/doc/hledger_timeclock.5 b/hledger-lib/hledger_timeclock.5
similarity index 100%
rename from hledger-lib/doc/hledger_timeclock.5
rename to hledger-lib/hledger_timeclock.5
diff --git a/hledger-lib/doc/hledger_timeclock.5.info b/hledger-lib/hledger_timeclock.5.info
similarity index 100%
rename from hledger-lib/doc/hledger_timeclock.5.info
rename to hledger-lib/hledger_timeclock.5.info
diff --git a/hledger-lib/doc/hledger_timeclock.5.m4.md b/hledger-lib/hledger_timeclock.5.m4.md
similarity index 100%
rename from hledger-lib/doc/hledger_timeclock.5.m4.md
rename to hledger-lib/hledger_timeclock.5.m4.md
diff --git a/hledger-lib/doc/hledger_timeclock.5.txt b/hledger-lib/hledger_timeclock.5.txt
similarity index 100%
rename from hledger-lib/doc/hledger_timeclock.5.txt
rename to hledger-lib/hledger_timeclock.5.txt
diff --git a/hledger-lib/doc/hledger_timedot.5 b/hledger-lib/hledger_timedot.5
similarity index 100%
rename from hledger-lib/doc/hledger_timedot.5
rename to hledger-lib/hledger_timedot.5
diff --git a/hledger-lib/doc/hledger_timedot.5.info b/hledger-lib/hledger_timedot.5.info
similarity index 100%
rename from hledger-lib/doc/hledger_timedot.5.info
rename to hledger-lib/hledger_timedot.5.info
diff --git a/hledger-lib/doc/hledger_timedot.5.m4.md b/hledger-lib/hledger_timedot.5.m4.md
similarity index 100%
rename from hledger-lib/doc/hledger_timedot.5.m4.md
rename to hledger-lib/hledger_timedot.5.m4.md
diff --git a/hledger-lib/doc/hledger_timedot.5.txt b/hledger-lib/hledger_timedot.5.txt
similarity index 100%
rename from hledger-lib/doc/hledger_timedot.5.txt
rename to hledger-lib/hledger_timedot.5.txt
diff --git a/hledger-ui/doc/hledger-ui.1 b/hledger-ui/hledger-ui.1
similarity index 100%
rename from hledger-ui/doc/hledger-ui.1
rename to hledger-ui/hledger-ui.1
diff --git a/hledger-ui/doc/hledger-ui.1.info b/hledger-ui/hledger-ui.1.info
similarity index 100%
rename from hledger-ui/doc/hledger-ui.1.info
rename to hledger-ui/hledger-ui.1.info
diff --git a/hledger-ui/doc/hledger-ui.1.m4.md b/hledger-ui/hledger-ui.1.m4.md
similarity index 100%
rename from hledger-ui/doc/hledger-ui.1.m4.md
rename to hledger-ui/hledger-ui.1.m4.md
diff --git a/hledger-ui/doc/hledger-ui.1.txt b/hledger-ui/hledger-ui.1.txt
similarity index 100%
rename from hledger-ui/doc/hledger-ui.1.txt
rename to hledger-ui/hledger-ui.1.txt
diff --git a/hledger-web/doc/hledger-web.1 b/hledger-web/hledger-web.1
similarity index 100%
rename from hledger-web/doc/hledger-web.1
rename to hledger-web/hledger-web.1
diff --git a/hledger-web/doc/hledger-web.1.info b/hledger-web/hledger-web.1.info
similarity index 100%
rename from hledger-web/doc/hledger-web.1.info
rename to hledger-web/hledger-web.1.info
diff --git a/hledger-web/doc/hledger-web.1.m4.md b/hledger-web/hledger-web.1.m4.md
similarity index 100%
rename from hledger-web/doc/hledger-web.1.m4.md
rename to hledger-web/hledger-web.1.m4.md
diff --git a/hledger-web/doc/hledger-web.1.txt b/hledger-web/hledger-web.1.txt
similarity index 100%
rename from hledger-web/doc/hledger-web.1.txt
rename to hledger-web/hledger-web.1.txt
diff --git a/hledger/doc/hledger.1 b/hledger/hledger.1
similarity index 100%
rename from hledger/doc/hledger.1
rename to hledger/hledger.1
diff --git a/hledger/doc/hledger.1.info b/hledger/hledger.1.info
similarity index 100%
rename from hledger/doc/hledger.1.info
rename to hledger/hledger.1.info
diff --git a/hledger/doc/hledger.1.m4.md b/hledger/hledger.1.m4.md
similarity index 100%
rename from hledger/doc/hledger.1.m4.md
rename to hledger/hledger.1.m4.md
diff --git a/hledger/doc/hledger.1.txt b/hledger/hledger.1.txt
similarity index 100%
rename from hledger/doc/hledger.1.txt
rename to hledger/hledger.1.txt
diff --git a/hledger/doc/hledger_addons.m4.md b/hledger/hledger_addons.m4.md
similarity index 100%
rename from hledger/doc/hledger_addons.m4.md
rename to hledger/hledger_addons.m4.md
diff --git a/hledger/doc/hledger_balance.m4.md b/hledger/hledger_balance.m4.md
similarity index 100%
rename from hledger/doc/hledger_balance.m4.md
rename to hledger/hledger_balance.m4.md
diff --git a/hledger/doc/hledger_commands.m4.md b/hledger/hledger_commands.m4.md
similarity index 100%
rename from hledger/doc/hledger_commands.m4.md
rename to hledger/hledger_commands.m4.md
diff --git a/hledger/doc/hledger_examples.m4.md b/hledger/hledger_examples.m4.md
similarity index 100%
rename from hledger/doc/hledger_examples.m4.md
rename to hledger/hledger_examples.m4.md
diff --git a/hledger/doc/hledger_options.m4.md b/hledger/hledger_options.m4.md
similarity index 100%
rename from hledger/doc/hledger_options.m4.md
rename to hledger/hledger_options.m4.md
diff --git a/hledger/doc/hledger_queries.m4.md b/hledger/hledger_queries.m4.md
similarity index 100%
rename from hledger/doc/hledger_queries.m4.md
rename to hledger/hledger_queries.m4.md
diff --git a/hledger/doc/hledger_troubleshooting.m4.md b/hledger/hledger_troubleshooting.m4.md
similarity index 100%
rename from hledger/doc/hledger_troubleshooting.m4.md
rename to hledger/hledger_troubleshooting.m4.md
diff --git a/hledger/doc/other/README b/hledger/other/README
similarity index 100%
rename from hledger/doc/other/README
rename to hledger/other/README
diff --git a/hledger/doc/other/hledger-api.1 b/hledger/other/hledger-api.1
similarity index 100%
rename from hledger/doc/other/hledger-api.1
rename to hledger/other/hledger-api.1
diff --git a/hledger/doc/other/hledger-api.1.info b/hledger/other/hledger-api.1.info
similarity index 100%
rename from hledger/doc/other/hledger-api.1.info
rename to hledger/other/hledger-api.1.info
diff --git a/hledger/doc/other/hledger-api.1.txt b/hledger/other/hledger-api.1.txt
similarity index 100%
rename from hledger/doc/other/hledger-api.1.txt
rename to hledger/other/hledger-api.1.txt
diff --git a/hledger/doc/other/hledger-ui.1 b/hledger/other/hledger-ui.1
similarity index 100%
rename from hledger/doc/other/hledger-ui.1
rename to hledger/other/hledger-ui.1
diff --git a/hledger/doc/other/hledger-ui.1.info b/hledger/other/hledger-ui.1.info
similarity index 100%
rename from hledger/doc/other/hledger-ui.1.info
rename to hledger/other/hledger-ui.1.info
diff --git a/hledger/doc/other/hledger-ui.1.txt b/hledger/other/hledger-ui.1.txt
similarity index 100%
rename from hledger/doc/other/hledger-ui.1.txt
rename to hledger/other/hledger-ui.1.txt
diff --git a/hledger/doc/other/hledger-web.1 b/hledger/other/hledger-web.1
similarity index 100%
rename from hledger/doc/other/hledger-web.1
rename to hledger/other/hledger-web.1
diff --git a/hledger/doc/other/hledger-web.1.info b/hledger/other/hledger-web.1.info
similarity index 100%
rename from hledger/doc/other/hledger-web.1.info
rename to hledger/other/hledger-web.1.info
diff --git a/hledger/doc/other/hledger-web.1.txt b/hledger/other/hledger-web.1.txt
similarity index 100%
rename from hledger/doc/other/hledger-web.1.txt
rename to hledger/other/hledger-web.1.txt
diff --git a/hledger/doc/other/hledger_csv.5 b/hledger/other/hledger_csv.5
similarity index 100%
rename from hledger/doc/other/hledger_csv.5
rename to hledger/other/hledger_csv.5
diff --git a/hledger/doc/other/hledger_csv.5.info b/hledger/other/hledger_csv.5.info
similarity index 100%
rename from hledger/doc/other/hledger_csv.5.info
rename to hledger/other/hledger_csv.5.info
diff --git a/hledger/doc/other/hledger_csv.5.txt b/hledger/other/hledger_csv.5.txt
similarity index 100%
rename from hledger/doc/other/hledger_csv.5.txt
rename to hledger/other/hledger_csv.5.txt
diff --git a/hledger/doc/other/hledger_journal.5 b/hledger/other/hledger_journal.5
similarity index 100%
rename from hledger/doc/other/hledger_journal.5
rename to hledger/other/hledger_journal.5
diff --git a/hledger/doc/other/hledger_journal.5.info b/hledger/other/hledger_journal.5.info
similarity index 100%
rename from hledger/doc/other/hledger_journal.5.info
rename to hledger/other/hledger_journal.5.info
diff --git a/hledger/doc/other/hledger_journal.5.txt b/hledger/other/hledger_journal.5.txt
similarity index 100%
rename from hledger/doc/other/hledger_journal.5.txt
rename to hledger/other/hledger_journal.5.txt
diff --git a/hledger/doc/other/hledger_timeclock.5 b/hledger/other/hledger_timeclock.5
similarity index 100%
rename from hledger/doc/other/hledger_timeclock.5
rename to hledger/other/hledger_timeclock.5
diff --git a/hledger/doc/other/hledger_timeclock.5.info b/hledger/other/hledger_timeclock.5.info
similarity index 100%
rename from hledger/doc/other/hledger_timeclock.5.info
rename to hledger/other/hledger_timeclock.5.info
diff --git a/hledger/doc/other/hledger_timeclock.5.txt b/hledger/other/hledger_timeclock.5.txt
similarity index 100%
rename from hledger/doc/other/hledger_timeclock.5.txt
rename to hledger/other/hledger_timeclock.5.txt
diff --git a/hledger/doc/other/hledger_timedot.5 b/hledger/other/hledger_timedot.5
similarity index 100%
rename from hledger/doc/other/hledger_timedot.5
rename to hledger/other/hledger_timedot.5
diff --git a/hledger/doc/other/hledger_timedot.5.info b/hledger/other/hledger_timedot.5.info
similarity index 100%
rename from hledger/doc/other/hledger_timedot.5.info
rename to hledger/other/hledger_timedot.5.info
diff --git a/hledger/doc/other/hledger_timedot.5.txt b/hledger/other/hledger_timedot.5.txt
similarity index 100%
rename from hledger/doc/other/hledger_timedot.5.txt
rename to hledger/other/hledger_timedot.5.txt