Add translation files. Code refactoring