Sounds like you're ripping individual tracks and not full discs, so try this for future ripping: go to Preferences>Advanced>General and uncheck "Keep iTunes Music Folder organized". That's the setting that creates Artist, etc folder organization in the ~/Music/iTunes/iTunes Music library.
You'll probably have to deal with your previously ripped tunes by digging through the iTunes Library subfolders in the Finder and moving them manually.