[Android] Project structure fix
[Android] Structure re-fix