Refactored big time. Created classes for content and trace objects