removed extraction from classifier and moved it into extractor,

Added defines for types and added to classifier