Update structure

Update structure