Reorganizing project layout.