change structure

change structure