Hello Chuck -
Hmm, could use some organization.
Try drawing a layout of what you WANT to have and add side bar notations as to what in included from the current arrangement.
Search your hard drive for all PST files and make a list. Also decide what you really need to access on a daily basis - and no, "everything" is not a good answer.
Once those are done we can look at how to construct the desired mapping.