Modified cmdline

Split cmdline content into more classes, for easier understanding and
modularity