Merge branch 'release/2.1.5' into develop
remove unused require in cli
refactor cli
rename cli file
Version bump to 2.1.6
Merge branch 'release/2.1.6'