restructured apa exporter to facilitate secondary sources in a later commit