Moved Collator from Data to Component, cleaner structure of classes.