More cli commands
Restructuring