Restructure Parts of UCP
final changes for ucp
final changes for ucp
Merge branch 'release/12.0' into develop