Folder re-organization.