Reorganization for upcoming changes.