Rename 'Simple' convenience module to 'Make_simple', as it is a functor