Reorganized directory structure.