Repaired directory structure and filter.