Modified structure

task-16Y updated by master(16.02)