added flag to set up fortumo billing
refactoring
reverted some changes