Upload
Merge branch 'channels'
Upload rename
removed unused files