Recently, I re-installed Windows 7 and before installing, I backed up all of my emails, contacts and accounts.  After installing the new Windows 7, I was able to restore my accounts and contacts.  However, when I tried to restore me emails, they all got imported into storage folders, not into the accounts I backed up from.  I have several folders and sub-folders so moving each from the storage folders to my account folders requires me to create a folder in my account folder, go to that folder in the storage folder, then copy the emails back to the account folder.  Is there a way to restore/import them directly to the account folders?