Rearranged the structure