Restructure Parts of UCP