While I'm inclined to agree, see line 22, where the payment method choice form type class is included. I was trying to stay in line with the established conventions. If it is preferred to have these in services, I can move them both and submit another pull.