Modified struct of models.

Changed structure of Models.