refactor out module package