Split CLI specs into two files