Refactor code
Merge branch 'router' of github.com:SIGMA-IT/sgm-nodejs into router