Files but no Albums

I could find this exact situation, so feel free to point me to the correct thread . . .

After ripping my CDs, the ‘album’ was pulled from the folder that WMP created and then that ‘parent’ folder was deleted — we thought that would streamline things. Apparently we were wrong.

I can only see the albums under ‘files’, and if I select a song with the iPhone app is does not go on to play the rest of the album.

Is there a tool or steps I can take to correct this, and keep songs on the same album even though guest artists are on a given song (avoid that showing up under different artists).

Thanks in advance!