Moving model data structures to a separate file am: e396abf502

Change-Id: Ie1460415f62162a34e50eb2a2c6a1df99e07a18d