Reorganize into dirs.