Structure changed !

I was wrong with my plan .. this is the best way I hope