[UPDATE] structural changes
Merge branch 'development'