Refactors the command line classes