Corrections and additions.

Some corrections and additions to the functions which process the input
file and directory path.
Extractor class added.