Refactored converter
Rafactoring. Adding class
Made huge rafactoring on convertation script
Performed new tests