Concerning what happens to the albums going from 3.8.4 pl1 to 4.0 publisher suite

[setishock]

I'm concerned about my picture files that were moved to the file system from the database a good while back. I have accumulated roughly 4000 pictures. I'd really hate to have to upload those again. I will if I have to but would rather not have to.

Questions then come down to:
If I leave my pictures in the file system, will they get imported when I upgrade?
Or just prior to doing the upgrade should I move them back in to the database?

I'm not concerned about hacks and mods and skins not getting ported over. I can deal with that. Just wondering how to port over my pictures when the time comes.

[Dismounted]

Any attachments, avatars, etc. will remain and still be "linked" to its previous content. As always, its a good idea to back up the database beforehand.