[Uploadable] Refactoring: extracting path resolve logic to separate method, few renames and phpdoc fixes