I figured it out. I used the default "File Manager" app to move all my music to a random folder, deleted my music folder, rebooted, recreated my music folder put everything back rebooted, and opened the Music app and everything showed up like it was supposed to.
Thanks,