updated paths and added android support there as well