Container reorganization