Nokia N97 :: Camera Pics / Videos Not Captured Folder Since Upgrade To 2.1?

As the title says all my images and videos are now no longer within the captured folder when you go into photo's, I have tried deleting all of the _PAlbTN folders, also factory reset the device, still nothing there, any ideas on what I can do to get these back in the captured folder?Otherwise it seems a pointless feature if every firmware update you lose all the data captured over the months since the last update, I have also tried copying all in the camera album over to the PC and put back onto the phone mass memory.It's doing my head in now, I have trawled the forums to find information but nothing. I have a lot of other items on my mass memory which I have accumilated from over the years and transferred to each new phone I get, got something in the region of 2500 images and videos, on the mass memory stored in the traditional way, where E is the mass memory etc:
E:Images200610200610A0
Instead of the new way i.e.
E:ImagesCamera200910200910A0

Do the files (images and videos) get assigned new tags to allow it to identify them as being taken on the device, my viewby month folder is also not working.