Fixed import problems in payments module