Moved message classes to their own package