Remove Factory coupling from Model Package

Removes Factory and simplifies the package by using more DI.

Refs #32