Best Practices - Attachments & Docs in CRM

Best Practices - Attachments & Docs in CRM

With an eye toward the future...I continually upload pdf's that correspond to products I have in CRM.

What's the best way to organize my docs so that I will have minimal restructuring time once CRM is merged with Z Docs?

Should I be uploading pdf's into Z Docs now and organize them there in preparation of merging with CRM later? Or should I continue to upload PDF's to my product pages as "attachments" and organize them later when Z Docs & CRM are merged?

Thx, James