Fixing the subfoldering issue