Proposal for #475. Clarify the logic of the AssetClassifier, 

and make it just a module: Not sure what advantage we got from being state-ful. Tests pass.