Move command-line-specific classes into command_line subdirectory; remove inappropriate dependencies