Merge "Simplify package structure cps-ncmp-rest"