tmp commit: move some classes to models folder

Change-Id: I8f3d3676623c687cb79e6c840f740c311cfb1a49