Huge app cli refactoring