Restructure channels