XP to Win7 restore: does 'Shared Docs' become 'Public Folders'?

Question

Before upgrading from XP to Win7, I backed up my Catalog to an external HD.  With XP, I had my Catalog (all or mostly) in Shared Documents.  With Win7, Public Folders seems to have replaced Shared Docs.  When I restore the Catalog, will my PSE5 (or Win7) know to now put the photo folders in Public Folders?...Or will it try to create a new location called Shared Documents?   (On upgrading, I used Windows Easy Transfer to migrate all documents and settings, and it automatically put my photo folders in Public Folders on Win7.  I want to run a Restore to be sure my Catalog is right.  But I don't want to end up with two complete sets of photo folders in two different places on my hard drive.)

Answer 1

If you use Time Machine, you can use Migration Assistant and migrate from Time Machine, while logged into your new account. That is one of the Migration Assistant +data source+ options.
If you want to use a more manual approach, and I guess the way I would do it (so that I know what's going on), is through the Shared folder at
<root level>/Users/Shared/
Make a new folder called Transfer in the Shared folder. While logged in to your usual account, go through each of your +user home folder+ sub-folders (such as Documents and Music ), one at a time. So copy the contents of one of those sub-folders to the Transfer folder. Make sure you are copying (by holding down the Option key) instead of moving to keep your current user account intact until the new one is set up. You are basically duplicating, not moving.
Turn on +Fast User Switching+ in System Preferences Accounts pane. Switch to the new user account. Take the contents of the Transfer folder and move it (this time move instead of copy ) to replace the files and folders in the equivalent +user home folder+ sub-folder of the new account. Repeat this procedure for each +user home folder+ sub-folder, going back and forth between the two account.
The only folder you should avoid is the Library sub-folder, because that is probably where your networking problem actually resides. So for that one, selectively transfer personal data, such as the Mail folder; don't transfer the entire contents of the Library folder to the new account.
Make sure your new account has access to all of your data (there are no permissions issues). You can keep the old account intact for a while to make sure everything is OK and present in the new account, and eventually delete the old account.
Maybe that's not quite so "simple" (a bit repetitive); there may be a better way; I just wrote down how I would do it.