Fixed wrong packaged in models.
Resolving imports slightly improved.