refactor UCT package