Refactor CCard package