Removing package based factories instead using central object factory.
removing object params.
Merge pull request #126 from mnjuhn/dev

Pull in factory refactor and some clean up