Move model-implementations into the model-package

[tomsontom]

Currently we have:

• impl
  • model
    • json - with the implementations
• model - with the interfaces

We should move the impl into the model-package so that the final structure is

• model - with the interfaces
  • impl
    • json - with the implementations