Reorganization and changes