Working on refactoring our DataCollectors to their own namespace.