Folder refactor
Additional fixes to refactor
Folder: refactoring
Merge branch 'refactor' of https://github.com/msemenistyi/hurri into refactor