Added back android folder