Initial commit of cleanup of ccg-ui. Needs external putki to build.