Finalize the export module refactoring