Animating a butterfly in 3D

I need to animate a butterfly in 3D. I created the wings with 2 identical shapes. I animated the wings flapping with the rotation tool. So now I have a stationary butterfly that's flapping its wings. Should I animate the butter fly on the same comp or should I create a new comp and import the butterfly into that new comp? I tried to animate the butterfly moving in a new comp, but it's difficult to work with because you're animating the whole comp, meaning when you select the butterfly, it's the whole comp you're selecting, not just the butterfly. This makes it difficult to work with.