reorganizing the structure