Reorganise Config opts. / See #6