[Android] Code cleaned and internal classes externalized.