change structure

Change some structure