[GOZ-20] Meet psr-4 requirements