Normalized and renamed files, refactored a bit location for Extractor.