Equals / HashCode improvements
Moved ingesters, discoverers and enrichers into vertical packaging