add more channel manager messages, reorganize containers
new files for reorganization of containers