Moved "Convert" procedures to separated static class
Infrastructure refactoring