Structure change

Fixed structure