Organize payment classes