Revert "fix the order of events"

This reverts commit 01495d47140b245a865be8de8324b9a56d615e93.
change order of exports.types