Merging file locations when some files are local and others are stored on a network drive

I have a network attached storage (NAS) device that my MacBook Air is mounted to. I set that as the location for my "Music" library in the preferences. I ripped a ton of my audio CD's to the shared network folder using Music, and all appeared well.

Then, I rebooted my laptop one day, and continued ripping more CD's. Unbeknownst to me, it started ripping them to my local hard drive on the MacBook Air instead of the NAS. So, now some of my Music library is located on my local system and other tracks are stored on the NAS.

Can I just move all the folders from my local library to the NAS folder, and will iTunes automatically update the link to the file, or how do I make sure they are all in the same place?

I have since read instructions on how to permanently mount a network folder using "login items" in the preferences, so hopefully my system won't loose the connection again, now I just need to get my files all in the right place because ultimately I want to have the library available on my MacBook Air, as well as Plex in my living room and other devices.