Moving model data structures to a separate file

Change-Id: I77ad7a5219e72d2e0d6c1803de2ac3ed6a65a8f7
146 files changed