Android: Shuffling classes and packages to improve the structure of the packages in the app.

No code has been changed by this commit, just moved (except for Eclipse auto-update of packages references inside classes).