adjust the structure

adjust the structure