#87: Reorganize 'Configuration' section

Resolves #87.