Reorganize android sources