Reorganized directory structure (first step).