Port modules to req-package equivalents