Change structure
change structure 2
Merge branch 'vladimir'