Update the structure

Update the structure