Reorganizing to sync with android structure.