Reorganise CLI structure