Refactoring exporters & fixing light exporters (light exporting almost working)