Move to Data

Change-Id: I4227abfcb77dfb0f33cc772dc3ac0f07634f6800