re-org, new data layer