Restructuring code for SDK compliance
Merge branch 'master' of github.com:abhishekchoudhary/fx-statistics