refactor a few android specific classes into their own package.