wip: command_line: change module / class structures