Refactored Encontrista and Dinossauro to use concerns and business logic