I recently upgraded to an iPhone 4 and set it up as a new device rather than restoring from a backup. Since then I've restored from backup several times in a bid to fix my atrocious battery life. Each time I do I find my Apps aren't restored where they were when i last backed up. Most (but not all) folders are deleted and the Apps are spread about randomly. Any ideas why this happens or how to get around it?