Reorganizing for upcoming config changes.