changed project structure4