[Extract] map-extractor moved to new location and cleaned up