Make Content.controller public
Re-merged Document/Content
Eliminate Connection's knowledge of Messages