Reorganized export.h