Would it make sense to gather all of these in a separate (extension) module?