Agile Dev Lab 7  - Change models to scala.

Also begin changing api/impl  to scala.