Revert "moved mock command line class to spec file and rename"

This reverts commit 03f3c87934ec189a7c2b75e0ddff67cf7ac5bb40.