Reorganize containers