Folder placement and the apps in them will stay the same after the direct upgrade. If you were to perform a fresh restore, as long as you've backed up your device prior to the restore, your formatting of the apps and folders and such will remain the same.