Migrated to Object Oriented design, moved classes/prototypes into their appropriate headers