Moved event and messaging related classes around a bit