Separate vars and classes promise types into modules