refactoring: Fixing legacy pathnames #2038
+132
−255
Merged
10000