Refactored to move all message model classes to models package.