Reordered folder structure.