Docs: improve organization

Consolidate several smaller sections into larger ones