Well, I'll try to do my best, but it may take some time, bacause I'm a rookie :)
Should I close this pull request and open new one to the new branch, on top of refactoring commit?
BTW, I've updated this commits with latest changes.