Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
Use empty lines between defs.