Updates structures to uniform blocks
Update project file
Merge branch 'Lesson48' into development