added payment-sofort and payment-common
removed *.java includes