module-ize all the things