Restore back path to source files
[packaging] Merge remote-tracking branch 'tmeshkova/master'