Updates to Cosm + moved Android Code