Reordered folder structure