changed project structure 5