move class include into module for cleanliness