Update reflecting directory re-organization.