Moved channels into their own namespace. Regorganized imports.
Removed trailing space.