Organized imports of DataModel component

Change-Id: I308fed6695a2cd542d6a7680aec8d275c286147c