change the structure

change the structure