Android - modify architecture