Merge "Refactored cps-ri package structure"