Prototyping

* Added Models
* removed obsolete stuff
* added IdGenerator and tests