Reorganize, adapt to new layout