Revert "ДА:рефакторинг"

This reverts commit e8b17dd285f9cc40a6d1b19444ac11cb06419f86.
Merge remote-tracking branch 'origin/dev' into dev