Revert "Remove the contrib modules"

This reverts commit c601f1f5f94be9018d313509ab0332c7b875720e.