simplify file structure; add channels