Moved channel and key namespaces to the files that use them