Reorganizing project structure.