Split cli from core