8.69: Reorganized channel modules