Finished refactoring to new export file type