completely changed project structure