Massive refactoring to make it possible to consolidate multiple similar features into a single feature in the config.