Clean up and reorganize.
Merge branch 'cleanup'

Conflicts:
	services/payment_service.rb
	services/selection.rb