New folder structure.