Reorganizing and creating conventions for end user configuration and overrides, etc.