changed project layout
cleanup