Fixing the subfoldering issue
Attempting to fix subfoldering issues