itunes library help

I previously moved my entire itunes library and files to an external HD and have had it this way for months with no issues.

after upgrading to itunes 11 a couple days ago I think itunes reset the library folder to the default and today when I went to sync my iPad, some files were moved to the new library.

if you see this screen shot, I have my original itunes library on the external drive and now have a new folder called "iTunes media" where a few apps and files were downloaded to.



I'm wondering how I can safely combine my two libraries back into one (have everything on the external drive).

Apologies if this is a rudimentary question; I have not admit I'm not the greatest at these technical things. TIA for any help or suggestions anyone can provide.

 

Thanks! That's what i was thinking but worries that i'm going to mess something up and loose everything.

Also, the old folders are just under "iTunes" but the new folders are under "iTunes media" Does this mean anything?

Okay...I'm confusing myself now