Over the weekend I got some water on my iPhone. Luckily it is covered by the insurance I got for it. New one should be in this week. My question is what is the best way to restore using the backup I had done last week. Recently for one of the iOS updates it failed and it wiped the phone. I was forced to perform a restore. When it restored it took away all the folders I had setup and dropped each app as an individual. It took hours to get everything back in organized folders. I have a LOT of apps. Is there something I can do to ensure that the organization that I have spent a fair amount of time working on is not wasted.