Reorganized directory structure (second step).