libraries

Hello everybody,

After replacing my internal HD, I installed iTunes and copied my music files from an external HD onto the internal HD.
I just copied my music folder and selected the folder in the iTunes preferences. (Probably my mistake.)

I now have got a Music folder that isn't in the User folder (but on internal HD) and a second one at user/music/iTunes/iTunes Media, where my new additions get stored.

How can I merge these two libraries? Will I loose the cover art?

I'd preferably would like to have all the files stored in the user's iTunes Media folder. But I'd prefer to go for the lesser time consuming and easiest solution.

Thanks and cheers.