Dmitriy/move refactored classes

Andrey Veltischev requested to merge dmitriy/move_defactored_classes into master
Edited by Andrey Veltischev

Merge request reports