repackaged to include files in subfolders