Merge "Refactor DirectoryFragment."