reorganized config