Redesign classes (CommandLine isn't an Git) remove inheritance