CLI code is now separated from core code.