change the structture
change the structture