question for 863211

dear 863211:
I am filing I-130 and I-485 together. I am planning to use big paper clips to clip the two package separately. In the checklist of the two forms, they both require the form G864,the affidavit of support, and my 325A, shall I include those forms twice, one in each package? Since everything is going to be all in one envelope, would that be annoying to them? What is the correct way to do it?

Thanks