Organizing CB touchpad fixes