Reorg of most Android presentations into separate files. More specific assignments.