changed project structure2