changed project structure and chaned build.gradle