Refactoring classes for Nokia X

Following documentation at
http://developer.nokia.com/resources/library/nokia-x/nokia-in-app-paymen
t/nokia-in-app-payment-porting-guide.html