how best to get my old library back since upgrade

I see that all the new music etc is going into the my media folder now but all my music is in the iTunes music folder and the apps are in the mobile app folder etc. what is the best procedure for getting that all straight again so I can see them when I open iTunes? add folder to library?