#87: Reorganize 'Configuration' section