package refactoring. cp-cardinality update