Reorganize the structure