Refactored content and message classes
Created new helper classes for message and content
Made changes to the code base post refactoring