Refactor code
Add channels controller