Fixes

Fixed problem with output russian text
Corrected project structure