Refactor - model classes

* Just inherit from dict.
* no more key distriction