reorganizing project layout, etc