Renamed modules for new cli
Merge pull request #279 from 28msec/rename-modules-for-new-cli

Renamed modules for new cli