added Extractor class, and updated javadoc