Reorganize into directories.