changed project structure3