reorganize (again)