fred: priprava na modularitu - 2
Signed-off-by:Colesnicov Denis Petrovich <eugustus@gmail.com>