Remove Factory coupling from Model package

Removes Factory and simplifies the package by using more DI.

Refs #32