1) File AP and EAD separately; 2) File them to where you filed your I-485; That's how I did to renewal mine last November. Good luck.