Reorganizing features overrides in a single module.
Updated Features Overrides.