Changed around how zip is stored and added android support