Mockup android cleaning

and other refactorings.

I think that after this pr we can finally start developing for the eAdventure Mockup 2 version.