Revert refactoring
Merge pull request #120 from KKBOX/dev_ethan2

Revert refactoring
Merge branch 'dev' into dev_peterzl