Reorganize exports