reorganizing project layout