Massive reorganization and merge