Split data directory into public and private part

Card: analytics 1168
Change-Id: Ib915bbf8abeec37a409c315dea36e371f20834b8