Reorganize dir struct.