Began adapting android specific code to the new structure