Update configuration

Part of #1540. Re-structure more of the docs, and remove more fluff.