Modify how packages with nested folders are displayed
Misc fixes