small refactoring for sourcegraph
Merge remote-tracking branch 'origin'
end of directory refactoring