Reorgnize the structure