Fix: Now handling the "no package" destination case
Merge branch 'file-refactoring'