updated android folder structure