Exporting supplier related data from R12.1.1

I am needing to export vendor names, addresses (from supplier sites) and contact name/email address (if one exists...using an outer join).  I have a working query (based on a couple of custom views), but would like to limit contacts by org (if possible).  The tables/views that I am querying are: 

ap_suppliers (for vendor name)

ap_supplier_sites (for addresses)

hz_relationships (to join to hz_contact_points and hz_parties)

hz_contact_points (for email_address)

hz_parties (for contact first and last name)

Are contacts recorded with an org_id in a table that I am missing?  Are there other tables/views that I should be querying?  I could provide the views and final query if needed, but there are other criteria that I had to include that might muddy the topic.