reorganized project layout