Probably need to/Should rebuild my Itunes/Music Library

I’ve found myself in a bit of a pickle with my iTunes library. I was having trouble starting the Genius feature, and someone suggested rebuilding the library file. They thought it might be corrupt.

I went ahead and did that, but things didn’t go as planned. About 90% of my music went unlinked. I managed to relink most of them, but I noticed some weird stuff. I had music folders inside music folders, and some music was in artist folders. Now, I can’t find a few songs.

I double-checked my purchases and downloaded any missing files, but some are still unlinked. I can’t find the music files that match the ones I’m looking for.

Is there a way to fix this? I’d love to have one music folder with one iTunes folder, and the music organized in the correct folders. I have a couple of smart playlists that sort based on how many times I’ve played them and my star rating. I’d like to keep that info, but I just want to reorganize the files.

Anybody have any ideas?