changed project structure 6