Reorganized Android part