Model demo added
[Evgeny, Jason] Model demo; Component class clean-up