Changed directory structure to reflect standard Android Studio setup, and that of Maven projects