organizing After Effects

I was having an issue organizing the sound files in after effects. I had all of the sound files in a separate layer, the image files in another and the music sound track in yet another. But everytime I adjusted a movie clip I had to readjust every sound file that followed it in the timeline. Now that I'm separating each shot into it's own clip I'm adding the sfx files into each nested composition along with the avi's. I'm leaving the music file as an overlay over the whole thing.