Reorganization for team merge