Restructure CPTs