Revert "Update generateModel for new model structure"

This reverts commit 06666bc38927c5981252d696a1ab3432d83947ea.

Change-Id: I909d9990d2679ddaab3c828c0c86d71a223a83b6
1 file changed