iPhone restore - will it restore folders with apps inside

As per the title; imagine you have to restore after spending weeks creating folders, organising, deliberating, moving pages, etc..but you restore only to find all your apps are out of their folders

The last restore i done which was many months ago, the iPhone didn't restore folders. Has anything changed? Any tips? How could apple overlooks? Or am i whining for nothing and it just works?

 

I found the solution! Only a week old info...see how my loyality to macrumours? I check here first and the apple forums later...

A copy and past for the solution. Hope it helps someone here;

1: Connect to your phone to iTunes (make sure this is before you tried to restore it or lost all your icons)
2: Right click your phone in the left hand menu and select "Back up" (record the time so you know which backup to use later)
3: wait for that to finish
4: If you need to do a full restore (firmware and software) click on your phone in the left hand menu then click the settings tab then click the restore button.
If you don't need to do a firmware restore (you do need to do this if apple has officially unlocked your phone or you have paid your phone carrier to do it) then just right click your phone in the left hand menu and click "restore from backup" it's important to note the difference between the two methods the first is a full firmware restore the second just puts your files back on the phone and does not touch the firmware.
5: Let it finish. Don't let it sync cancel it if it tries.
6: Once it's finished or it tries to start syncing and you have cancelled it click on your phone in the left hand menu and select "Restore from backup" (yes you have to do it twice it's not a typo). Make sure you select the backup you made in step 2.
7: let it finish and this time let is sync. It should take a while and once finished all your folders and apps will be there.