refactored some of the modules into their own recipes