Clean up Container a bit.
Move CoreEvents up a namespace.
Nicer event names.