Move payment related steps from org -> payment