Reorganize, simplify export