Move models to their own modules

Change-Id: Ib3d32496bfbc174dc136a269abf0b66cf0ae475d
Merge "Move models to their own modules"