Refactoring
Create CLI module.
Merge branch 'develop'