Structure changes
Changed the structure of our classes to fit future event-related needs.