Reorganizing internal structure