I'd think we should move payment stuff to a separate module.