moved sub parts of sub commands from user commands to CLI