moved android stuff into android folder