Rearraged folder structure