refactor config settings.

matching version of filestore code